holyfoot/hf@deer.(none)
814c1308ea
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into mysql.com:/home/hf/work/mysql-5.1-mrg
2007-01-10 18:33:28 +04:00
holyfoot/hf@deer.(none)
ebc89b9816
Merge mysql.com:/home/hf/work/24502/my51-24502
...
into mysql.com:/home/hf/work/mysql-5.1-mrg
2007-01-10 16:23:54 +04:00
holyfoot/hf@deer.(none)
743beccf87
Merge mysql.com:/home/hf/work/22451/my51-22451
...
into mysql.com:/home/hf/work/mysql-5.1-mrg
2007-01-10 16:22:47 +04:00
gluh@mysql.com/eagle.(none)
91d75da75e
Fix for bug#25026 information_schema.KEY_COLUMN_USAGE
.REFERENCED_TABLE_NAME
returns garbage
...
Unencode internal db & table name
2007-01-09 18:14:04 +04:00
holyfoot/hf@hfmain.(none)
ae836b4203
Merge bk@192.168.21.1:mysql-5.1
...
into mysql.com:/d2/hf/opt/my51-opt
2007-01-09 12:55:11 +04:00
gkodinov/kgeorge@macbook.local
23acc5b630
mi_check.c:
...
added a missing DBUG_RETURN
2007-01-08 17:27:28 +02:00
gkodinov/kgeorge@macbook.local
a30c09c33f
Merge macbook.local:/Users/kgeorge/mysql/work/mysql-5.0-opt
...
into macbook.local:/Users/kgeorge/mysql/work/merge-5.1-opt
2007-01-08 12:32:48 +02:00
brian@zim.(none)
05d05c776f
Fix for when shell version of mysql-test-run is called.
2007-01-05 22:28:53 -08:00
brian@zim.(none)
77004aabf2
Cleaning up warning for windows. Innodb is compiled but disable on Windows, so it should be fine. NDB wasn't compiled in, which is what caused the issue.
2007-01-05 20:20:53 -08:00
gkodinov/kgeorge@macbook.gmz
a63df24a68
Bug #15881 : cast problems
...
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.
2007-01-05 14:02:50 +02:00
brian@zim.(none)
c578350e05
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch
...
into zim.(none):/home/brian/mysql/merge-5.1
2007-01-04 12:06:40 -08:00
brian@zim.(none)
452a1331b2
The CSV format has always relied on numbers being quoted, which doesn't always happen. This fixes that so that numbers can now be unquoted (and the output does this as well so that the log takes up less space).
2007-01-04 11:41:17 -08:00
baker@bk-internal.mysql.com
9ffaf185f0
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2007-01-04 19:54:52 +01:00
brian@zim.(none)
6ff7092698
Split out the hidden class from the ha_tina file (probably should have just deleted it...) but this is a bit better.
2007-01-03 17:26:45 -08:00
gkodinov/kgeorge@rakia.gmz
47c044e418
Merge bk-internal:/home/bk/mysql-5.0-opt
...
into rakia.gmz:/home/kgeorge/mysql/work/B15439-5.0-opt
2007-01-03 18:29:39 +02:00
gkodinov/kgeorge@rakia.gmz
770608cf26
sql_udf.cc:
...
Addendum to the fix for bug#15439 : valgrind pb failed
2007-01-03 18:26:39 +02:00
holyfoot/hf@mysql.com/hfmain.(none)
79361c655a
Merge mysql.com:/d2/hf/common/my50-common
...
into mysql.com:/d2/hf/opt/my50-opt
2007-01-03 11:13:01 +04:00
holyfoot/hf@hfmain.(none)
14696a56e2
Merge mysql.com:/d2/hf/common/my50-common
...
into mysql.com:/d2/hf/common/my51-common
2007-01-03 03:36:39 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
8c2d34c3c6
merging
2007-01-03 03:35:57 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
8ff44eaeef
mysql_upgrade disabled in embedded server
2007-01-03 03:33:26 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
aad2026c2d
ps_not_windows disabled in embedded server
2007-01-03 03:31:12 +04:00
holyfoot/hf@hfmain.(none)
f95e387212
Merge mysql.com:/d2/hf/common/my50-common
...
into mysql.com:/d2/hf/common/my51-common
2007-01-03 02:43:59 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
988e2e4cad
Merge mysql.com:/d2/hf/common/my41-common
...
into mysql.com:/d2/hf/common/my50-common
2007-01-03 02:43:27 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
12cd7c7b3e
warning count for embedded prepared statements added
2007-01-03 02:41:14 +04:00
joerg@trift2.
60a3f102a4
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into trift2.:/MySQL/M51/mysql-5.1
2007-01-02 17:13:42 +01:00
joerg@trift2.
c445abef91
server-tools/instance-manager/Makefile.am
...
Delete compiler-specific flag setting - it makes builds break.
2007-01-02 17:11:15 +01:00
holyfoot/hf@hfmain.(none)
4c588df26e
Merge bk@192.168.21.1:mysql-5.1
...
into mysql.com:/d2/hf/common/my51-common
2007-01-02 18:02:27 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
a44106c07c
Merge bk@192.168.21.1:mysql-5.0
...
into mysql.com:/d2/hf/common/my50-common
2007-01-02 18:00:30 +04:00
holyfoot/hf@hfmain.(none)
e6b3a71cc0
Merge mysql.com:/d2/hf/common/my50-common
...
into mysql.com:/d2/hf/common/my51-common
2007-01-02 17:55:18 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
429b82bed3
Merge mysql.com:/d2/hf/common/my41-common
...
into mysql.com:/d2/hf/common/my50-common
2007-01-02 17:54:38 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
e7130631cb
merging fix
2007-01-02 17:53:55 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
56155d83e7
merging fix
2007-01-02 17:51:32 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
726a51bc77
Merge mysql.com:/d2/hf/common/my41-common
...
into mysql.com:/d2/hf/common/my50-common
2007-01-02 17:50:55 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
998167acce
embedded-server related fixes
2007-01-02 17:46:20 +04:00
kent@kent-amd64.(none)
7281ab80c8
Merge mysql.com:/home/kent/bk/main/mysql-5.0
...
into mysql.com:/home/kent/bk/main/mysql-5.1
2007-01-02 11:06:16 +01:00
kent@mysql.com/kent-amd64.(none)
499eb4d8ba
view.result:
...
Temporary work around for bug#25359
2007-01-02 11:01:48 +01:00
holyfoot/hf@hfmain.(none)
b4c0867df1
Merge mysql.com:/d2/hf/clean/my51-clean
...
into mysql.com:/d2/hf/common/my51-common
2006-12-31 12:41:42 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
874d366500
Merge mysql.com:/d2/hf/clean/my50-clean
...
into mysql.com:/d2/hf/common/my50-common
2006-12-31 12:39:20 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
0831699f5c
Merge mysql.com:/d2/hf/clean/my41-clean
...
into mysql.com:/d2/hf/common/my41-common
2006-12-31 12:37:42 +04:00
holyfoot/hf@hfmain.(none)
4e5b3baf74
Merge mysql.com:/d2/hf/common/my50-common
...
into mysql.com:/d2/hf/common/my51-common
2006-12-31 12:36:36 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
2ab15de7cd
Merge mysql.com:/d2/hf/common/my41-common
...
into mysql.com:/d2/hf/common/my50-common
2006-12-31 12:36:06 +04:00
kent@mysql.com/kent-amd64.(none)
67868597bb
Many files:
...
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
2006-12-31 02:29:11 +01:00
kent@kent-amd64.(none)
58763e383e
Merge mysql.com:/home/kent/bk/main/mysql-5.0
...
into mysql.com:/home/kent/bk/main/mysql-5.1
2006-12-31 01:32:21 +01:00
kent@kent-amd64.(none)
895e442dbf
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/kent/bk/main/mysql-5.1
2006-12-31 01:04:59 +01:00
kent@mysql.com/kent-amd64.(none)
1b8bd0d246
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/kent/bk/main/mysql-5.0
2006-12-31 01:04:07 +01:00
kent@mysql.com/kent-amd64.(none)
6523aca729
my_strtoll10-x86.s:
...
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
2006-12-31 01:02:27 +01:00
stewart@willster.(none)
344d78a563
Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb
...
into willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-mgm-work
2006-12-28 22:53:21 +11:00
holyfoot/hf@mysql.com/hfmain.(none)
feff4a5ec4
bdb_notembedded.test gone
2006-12-28 10:03:25 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
c90a426993
WL #3630 (add embedded server to pushbuild)
...
innodb.test fix
2006-12-28 09:44:56 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
842b23a8fc
WL#3630 (add embedded server to pushbuild)
...
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.
2006-12-28 09:42:04 +04:00