Commits · 360540e89173aa3c3d6f8998866953aefd869ab5 · Kirill Smelkov / mariadb

12 Oct, 2006 1 commit
- Revert patch for bug #19764, which did not work with prepared statements. · 360540e8
  tsmith/tim@siva.hindu.god authored Oct 11, 2006
  
  360540e8
04 Oct, 2006 1 commit

Bug #19764: SHOW commands end up in the slow log as table scans · f5c4d75e

tsmith/tim@siva.hindu.god authored Oct 03, 2006

Set a flag when a SHOW command is parsed, and check it in log_slow_statement().  SHOW commands are not counted as slow queries, even if they use table scans.

f5c4d75e

02 Oct, 2006 1 commit
- Merge bk-internal:/home/bk/mysql-5.0-maint · c3820867
  msvensson@neptunus.(none) authored Oct 02, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  c3820867
30 Sep, 2006 5 commits
- Fix __attribute__(A) macro (it formerly used bogus __cplusplus__ symbol) · 5ffa3e1b
  tsmith/tim@siva.hindu.god authored Sep 30, 2006
  
  5ffa3e1b
- Merge bk-internal:/home/bk/mysql-5.0-maint · f3ead515
  jimw@rama.(none) authored Sep 29, 2006
```
into  rama.(none):/home/jimw/my/mysql-5.0-clean
```
  f3ead515
- Merge rama.(none):/home/jimw/my/mysql-4.1-clean · 02962273
  jimw@rama.(none) authored Sep 29, 2006
```
into  rama.(none):/home/jimw/my/mysql-5.0-clean
```
  02962273
- Disable __attribute__ entirely on g++ < 3.4. (Bug #2717) · 52d22ad8
  jimw@rama.(none) authored Sep 29, 2006
  
  52d22ad8
- Merge bk-internal:/home/bk/mysql-4.1-maint · 5963b5af
  jimw@rama.(none) authored Sep 29, 2006
```
into  rama.(none):/home/jimw/my/mysql-4.1-clean
```
  5963b5af
29 Sep, 2006 9 commits
- 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 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 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 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 23 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 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
- 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/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 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
- 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 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
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · b2ee81a6
  cmiller@zippy.cornsilk.net authored Sep 28, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
```
  b2ee81a6
- Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 56d24063
  cmiller@zippy.cornsilk.net authored Sep 28, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
```
  56d24063
- Additional patch to Bug#21476: Free newly-allocated memory in mysqltest. · 75a1d1d5
  cmiller@zippy.cornsilk.net authored Sep 28, 2006
  
  75a1d1d5
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint · ca7ade88
  cmiller@zippy.cornsilk.net authored Sep 28, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
```
  ca7ade88
- Merge neptunus.(none):/home/msvensson/mysql/netware/my50-netware_libmysql_imp · 8ee337a5
  msvensson@neptunus.(none) authored Sep 28, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  8ee337a5
- Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt · de5542a0
  gkodinov@dl145s.mysql.com authored Sep 28, 2006
```
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
```
  de5542a0
- Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-5.0 · b0167d26
  gkodinov@dl145s.mysql.com authored Sep 28, 2006
```
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
```
  b0167d26
- Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-4.1 · 55cc4fd5
  gkodinov@dl145s.mysql.com authored Sep 28, 2006
```
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt
```
  55cc4fd5
- Merge neptunus.(none):/home/msvensson/mysql/work/my50-work · 3eb44cb1
  msvensson@neptunus.(none) authored Sep 28, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  3eb44cb1