Commits · ebc89b9816a0282080ef223b1455fec738fd4846 · nexedi / MariaDB

10 Jan, 2007 2 commits
- Merge mysql.com:/home/hf/work/24502/my51-24502 · ebc89b98
  holyfoot/hf@deer.(none) authored Jan 10, 2007
```
into  mysql.com:/home/hf/work/mysql-5.1-mrg
```
  ebc89b98
- Merge mysql.com:/home/hf/work/22451/my51-22451 · 743beccf
  holyfoot/hf@deer.(none) authored Jan 10, 2007
```
into  mysql.com:/home/hf/work/mysql-5.1-mrg
```
  743beccf
08 Jan, 2007 2 commits
- mi_check.c: · 23acc5b6
  gkodinov/kgeorge@macbook.local authored Jan 08, 2007
```
  added a missing DBUG_RETURN
```
  23acc5b6
- Merge macbook.local:/Users/kgeorge/mysql/work/mysql-5.0-opt · a30c09c3
  gkodinov/kgeorge@macbook.local authored Jan 08, 2007
```
into  macbook.local:/Users/kgeorge/mysql/work/merge-5.1-opt
```
  a30c09c3
05 Jan, 2007 1 commit

gkodinov/kgeorge@macbook.gmz authored Jan 05, 2007

  The optimizer removes expressions from GROUP BY/DISTINCT
  if they happen to participate in a <expression> = <const>
  predicates of the WHERE clause (the idea being that if
  it's always equal to a constant it can't have multiple 
  values).
  However for predicates where the expression and the 
  constant item are of different result type this is not
  valid (e.g. a string column compared to 0).
  Fixed by additional check of the result types of the 
  expression and the constant and if they differ the 
  expression don't get removed from the group by list.

a63df24a

03 Jan, 2007 3 commits
- Merge bk-internal:/home/bk/mysql-5.0-opt · 47c044e4
  gkodinov/kgeorge@rakia.gmz authored Jan 03, 2007
```
into  rakia.gmz:/home/kgeorge/mysql/work/B15439-5.0-opt
```
  47c044e4
- sql_udf.cc: · 770608cf
  gkodinov/kgeorge@rakia.gmz authored Jan 03, 2007
```
  Addendum to the fix for bug#15439 : valgrind pb failed
```
  770608cf
- Merge mysql.com:/d2/hf/common/my50-common · 79361c65
  holyfoot/hf@mysql.com/hfmain.(none) authored Jan 03, 2007
```
into  mysql.com:/d2/hf/opt/my50-opt
```
  79361c65
02 Jan, 2007 17 commits
- Merge mysql.com:/d2/hf/common/my50-common · 14696a56
  holyfoot/hf@hfmain.(none) authored Jan 03, 2007
```
into  mysql.com:/d2/hf/common/my51-common
```
  14696a56
- merging · 8c2d34c3
  holyfoot/hf@mysql.com/hfmain.(none) authored Jan 03, 2007
  
  8c2d34c3
- mysql_upgrade disabled in embedded server · 8ff44eae
  holyfoot/hf@mysql.com/hfmain.(none) authored Jan 03, 2007
  
  8ff44eae
- ps_not_windows disabled in embedded server · aad2026c
  holyfoot/hf@mysql.com/hfmain.(none) authored Jan 03, 2007
  
  aad2026c
- Merge mysql.com:/d2/hf/common/my50-common · f95e3872
  holyfoot/hf@hfmain.(none) authored Jan 03, 2007
```
into  mysql.com:/d2/hf/common/my51-common
```
  f95e3872
- Merge mysql.com:/d2/hf/common/my41-common · 988e2e4c
  holyfoot/hf@mysql.com/hfmain.(none) authored Jan 03, 2007
```
into  mysql.com:/d2/hf/common/my50-common
```
  988e2e4c
- warning count for embedded prepared statements added · 12cd7c7b
  holyfoot/hf@mysql.com/hfmain.(none) authored Jan 03, 2007
  
  12cd7c7b
- Merge bk@192.168.21.1:mysql-5.1 · 4c588df2
  holyfoot/hf@hfmain.(none) authored Jan 02, 2007
```
into  mysql.com:/d2/hf/common/my51-common
```
  4c588df2
- Merge bk@192.168.21.1:mysql-5.0 · a44106c0
  holyfoot/hf@mysql.com/hfmain.(none) authored Jan 02, 2007
```
into  mysql.com:/d2/hf/common/my50-common
```
  a44106c0
- Merge mysql.com:/d2/hf/common/my50-common · e6b3a71c
  holyfoot/hf@hfmain.(none) authored Jan 02, 2007
```
into  mysql.com:/d2/hf/common/my51-common
```
  e6b3a71c
- Merge mysql.com:/d2/hf/common/my41-common · 429b82be
  holyfoot/hf@mysql.com/hfmain.(none) authored Jan 02, 2007
```
into  mysql.com:/d2/hf/common/my50-common
```
  429b82be
- merging fix · e7130631
  holyfoot/hf@mysql.com/hfmain.(none) authored Jan 02, 2007
  
  e7130631
- merging fix · 56155d83
  holyfoot/hf@mysql.com/hfmain.(none) authored Jan 02, 2007
  
  56155d83
- Merge mysql.com:/d2/hf/common/my41-common · 726a51bc
  holyfoot/hf@mysql.com/hfmain.(none) authored Jan 02, 2007
```
into  mysql.com:/d2/hf/common/my50-common
```
  726a51bc
- embedded-server related fixes · 998167ac
  holyfoot/hf@mysql.com/hfmain.(none) authored Jan 02, 2007
  
  998167ac
- Merge mysql.com:/home/kent/bk/main/mysql-5.0 · 7281ab80
  kent@kent-amd64.(none) authored Jan 02, 2007
```
into  mysql.com:/home/kent/bk/main/mysql-5.1
```
  7281ab80
- view.result: · 499eb4d8
  kent@mysql.com/kent-amd64.(none) authored Jan 02, 2007
```
  Temporary work around for bug#25359
```
  499eb4d8
31 Dec, 2006 10 commits

Merge mysql.com:/d2/hf/clean/my51-clean · b4c0867d
holyfoot/hf@hfmain.(none) authored Dec 31, 2006
```
into  mysql.com:/d2/hf/common/my51-common
```
b4c0867d
Merge mysql.com:/d2/hf/clean/my50-clean · 874d3665
holyfoot/hf@mysql.com/hfmain.(none) authored Dec 31, 2006
```
into  mysql.com:/d2/hf/common/my50-common
```
874d3665
Merge mysql.com:/d2/hf/clean/my41-clean · 0831699f
holyfoot/hf@mysql.com/hfmain.(none) authored Dec 31, 2006
```
into  mysql.com:/d2/hf/common/my41-common
```
0831699f
Merge mysql.com:/d2/hf/common/my50-common · 4e5b3baf
holyfoot/hf@hfmain.(none) authored Dec 31, 2006
```
into  mysql.com:/d2/hf/common/my51-common
```
4e5b3baf
Merge mysql.com:/d2/hf/common/my41-common · 2ab15de7
holyfoot/hf@mysql.com/hfmain.(none) authored Dec 31, 2006
```
into  mysql.com:/d2/hf/common/my50-common
```
2ab15de7

Many files: · 67868597

kent@mysql.com/kent-amd64.(none) authored Dec 31, 2006

  Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
  Adjusted year(s) in copyright header 
  Added GPL copyright text
my_vle.h, rpl_utility.h, my_vle.c, base64-t.c, rpl_utility.cc:
  Changed copyright header formatting some
plugin_example.c, daemon_example.c:
  Added "Copyright (C) 2006 MySQL AB" to GPL header

67868597

Merge mysql.com:/home/kent/bk/main/mysql-5.0 · 58763e38
kent@kent-amd64.(none) authored Dec 31, 2006
```
into  mysql.com:/home/kent/bk/main/mysql-5.1
```
58763e38
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 · 895e442d
kent@kent-amd64.(none) authored Dec 31, 2006
```
into  mysql.com:/home/kent/bk/main/mysql-5.1
```
895e442d
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 · 1b8bd0d2
kent@mysql.com/kent-amd64.(none) authored Dec 31, 2006
```
into  mysql.com:/home/kent/bk/main/mysql-5.0
```
1b8bd0d2

my_strtoll10-x86.s: · 6523aca7

kent@mysql.com/kent-amd64.(none) authored Dec 31, 2006

  Corrected spelling in copyright text
Makefile.am:
  Don't update the files from BitKeeper
Many files:
  Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
  Adjusted year(s) in copyright header 
Many files:
  Added GPL copyright text
Removed files:
  Docs/Support/colspec-fix.pl
  Docs/Support/docbook-fixup.pl
  Docs/Support/docbook-prefix.pl
  Docs/Support/docbook-split
  Docs/Support/make-docbook
  Docs/Support/make-makefile
  Docs/Support/test-make-manual
  Docs/Support/test-make-manual-de
  Docs/Support/xwf

6523aca7

28 Dec, 2006 4 commits
- Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb · 344d78a5
  stewart@willster.(none) authored Dec 28, 2006
```
into  willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-mgm-work
```
  344d78a5
- bdb_notembedded.test gone · feff4a5e
  holyfoot/hf@mysql.com/hfmain.(none) authored Dec 28, 2006
  
  feff4a5e
- WL #3630 (add embedded server to pushbuild) · c90a4269
  holyfoot/hf@mysql.com/hfmain.(none) authored Dec 28, 2006
```
innodb.test fix
```
  c90a4269
- WL#3630 (add embedded server to pushbuild) · 842b23a8
  holyfoot/hf@mysql.com/hfmain.(none) authored Dec 28, 2006
```
5.1-related fixes
libmysqld/Makefile.am fixed to recompile and link ha_*.cc files that
keep dependance on THD structure.
Minor fixes to make tests working.
```
  842b23a8
27 Dec, 2006 1 commit
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 4333bcab
  tomas@poseidon.mysql.com authored Dec 27, 2006
```
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
```
  4333bcab