holyfoot/hf@mysql.com/hfmain.(none)
11dd0fa326
Merge bk@192.168.21.1:mysql-5.0
...
into mysql.com:/home/hf/work/mrg/mysql-5.0-opt
2007-03-08 21:42:41 +04:00
tsmith@bk-internal.mysql.com
8539d9a7bd
The most recent push into mysql-5.1 from mysql-5.2 was a mistake.
...
This just reverses those changes. I'm really sorry about that.
configure.in, version.c:
Reverse last push (from mysql-5.2 into mysql-5.1)
2007-03-08 18:38:17 +01:00
holyfoot/hf@mysql.com/hfmain.(none)
618ccf376f
Merge bk@192.168.21.1:mysql-4.1
...
into mysql.com:/home/hf/work/mrg/mysql-4.1-opt
2007-03-08 21:14:31 +04:00
df@pippilotta.erinye.com
1052f8702b
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-03-08 18:13:06 +01:00
df@pippilotta.erinye.com
7665f50e9c
add comment to compiler_warnings.supp
2007-03-08 18:12:16 +01:00
holyfoot/hf@mysql.com/hfmain.(none)
48d3e2c1bb
merging
2007-03-08 20:57:12 +04:00
tsmith@bk-internal.mysql.com
bb273143fc
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/tsmith-tmp/mysql-5.2
2007-03-08 17:55:20 +01:00
evgen@moonbone.local
35e5925673
sql_select.cc:
...
Postfix for bug#22331.
2007-03-08 19:38:21 +03:00
msvensson@pilot.blaudden
4374a47090
Update result for 5.1
2007-03-08 16:47:18 +01:00
holyfoot/hf@hfmain.(none)
75be7cd1ae
Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt
...
into mysql.com:/home/hf/work/mrg/mysql-5.1-opt
2007-03-08 19:08:28 +04:00
msvensson@pilot.blaudden
193c3178bc
Merge bk-internal:/home/bk/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
2007-03-08 15:10:24 +01:00
msvensson@pilot.blaudden
dd16b217c7
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-08 14:56:08 +01:00
msvensson@pilot.blaudden
433d3e6cf7
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-08 14:55:39 +01:00
msvensson@pilot.blaudden
73b5b2aed7
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-08 14:48:11 +01:00
msvensson@pilot.blaudden
8a8c69f3fd
Fix 6 warnings from win64, where one is a potential bug.
2007-03-08 14:29:29 +01:00
msvensson@pilot.blaudden
2739246719
Merge bk-internal:/home/bk/mysql-5.1-new-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-08 13:31:37 +01:00
msvensson@pilot.blaudden
49d862230e
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-08 13:30:04 +01:00
tsmith@quadxeon.mysql.com
0303429257
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
2007-03-08 08:17:12 +01:00
tsmith@quadxeon.mysql.com
fee7ab58c6
comp_err.c: return ha_checksum from checksum_format_specifier() - more correct, avoid a compiler warning
2007-03-08 08:15:30 +01:00
tsmith@quadxeon.mysql.com
ec87168115
Fix bad merge of mysql_upgrade.c; return to version 1.27 of the file, as after fix for bug 25074
2007-03-08 07:55:03 +01:00
tulin/mysqldev@production.mysql.com
8a065c02b4
Merge mysql.com:/data0/mysqldev/users/tomas/mysql-5.0-maint
...
into mysql.com:/data0/mysqldev/users/tomas/mysql-5.1-new-maint
2007-03-08 04:33:11 +01:00
tulin/mysqldev@mysql.com/production.mysql.com
ecd1dd17f2
Merge bk-internal:/home/bk/mysql-5.1-new-ndb
...
into mysql.com:/data0/mysqldev/users/tomas/mysql-5.1-new-maint
2007-03-08 04:27:41 +01:00
tulin/mysqldev@mysql.com/production.mysql.com
34c3cd810e
Merge bk-internal:/home/bk/mysql-5.0-ndb
...
into mysql.com:/data0/mysqldev/users/tomas/mysql-5.0-maint
2007-03-08 04:23:19 +01:00
tsmith@quadxeon.mysql.com
55aea4015d
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/50
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/51
2007-03-08 03:23:22 +01:00
tsmith@quadxeon.mysql.com
82c403e608
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/51
2007-03-08 03:20:16 +01:00
tsmith@quadxeon.mysql.com
a4ca7e7c01
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/51
2007-03-08 03:18:14 +01:00
tomas@poseidon.mysql.com
8370b2c5e0
Merge poseidon.mysql.com:/home/tomas/mysql-5.1
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-03-08 08:39:49 +07:00
tomas@poseidon.mysql.com
948ed82a2c
Merge poseidon.mysql.com:/home/tomas/mysql-5.0
...
into poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
2007-03-08 08:33:38 +07:00
tsmith@quadxeon.mysql.com
faecfb44a4
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/50
2007-03-08 02:22:50 +01:00
tsmith@quadxeon.mysql.com
ae94192129
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/misc/51-fedfix
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage1/51
2007-03-08 02:10:25 +01:00
tsmith@quadxeon.mysql.com
809f9f006f
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage1/50
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage1/51
2007-03-08 02:05:11 +01:00
tsmith@quadxeon.mysql.com
0cd9897eeb
Bug #26940 : CREATE SERVER does not initialize record[0] in insert_server_record()
...
sql_servers.cc:insert_server_record(): initialize record[0] before inserting row
2007-03-08 02:00:21 +01:00
tsmith@quadxeon.mysql.com
d093ba4757
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/41
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/50
2007-03-08 01:12:09 +01:00
tsmith@quadxeon.mysql.com
5959e8a60a
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/40
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/41
2007-03-08 01:06:04 +01:00
tsmith@quadxeon.mysql.com
de61dde90b
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/50
2007-03-08 01:00:49 +01:00
tsmith@quadxeon.mysql.com
6661e6b4a3
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1-build
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/41
2007-03-08 00:59:15 +01:00
tsmith@quadxeon.mysql.com
ba22ad7019
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg0306/51
2007-03-08 00:02:41 +01:00
tsmith@quadxeon.mysql.com
54c59e6159
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg0306/50
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg0306/51
2007-03-07 23:55:33 +01:00
tsmith@quadxeon.mysql.com
c06499b210
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg0306/50
2007-03-07 23:55:25 +01:00
tsmith@quadxeon.mysql.com
a5e0f606af
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/40
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg0306/40
2007-03-07 23:54:52 +01:00
tsmith@quadxeon.mysql.com
4656023eec
update test results for bdb_gis after merge of fix for b26038
2007-03-07 23:49:46 +01:00
kent@kent-amd64.(none)
106f1a7bf7
Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
...
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
2007-03-07 23:10:19 +01:00
kent@kent-amd64.(none)
1c09a96cf5
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
2007-03-07 23:08:54 +01:00
kent@mysql.com/kent-amd64.(none)
781b271c6f
Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build
...
into mysql.com:/home/kent/bk/tmp/mysql-5.0-build
2007-03-07 23:07:03 +01:00
kent@mysql.com/kent-amd64.(none)
8b2a4b2c47
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/kent/bk/tmp/mysql-5.0-build
2007-03-07 23:05:46 +01:00
kent@mysql.com/kent-amd64.(none)
5736467ab6
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/kent/bk/tmp/mysql-4.1-build
2007-03-07 23:04:25 +01:00
evgen@moonbone.local
999c1cdcc1
sql_select.cc:
...
Postfix for bug#22331 for windows platform.
explain.test, explain.result:
Cleanup after bugfix#22331.
2007-03-08 00:27:42 +03:00
evgen@moonbone.local
8936e53fca
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into moonbone.local:/mnt/gentoo64/work/25373-bug-5.0-opt-mysql
2007-03-07 22:23:08 +03:00
evgen@moonbone.local
c4fc9c5ef9
Merge moonbone.local:/mnt/gentoo64/work/22331-bug-5.0-opt-mysql
...
into moonbone.local:/mnt/gentoo64/work/25373-bug-5.0-opt-mysql
2007-03-07 22:22:19 +03:00
evgen@moonbone.local
b81b814cd1
Bug#25373: Stored functions wasn't compared correctly which leads to a wrong
...
result.
For built-in functions like sqrt() function names are hard-coded and can be
compared by pointer. But this isn't the case for a used-defined stored
functions - names there are dynamical and should be compared as strings.
Now the Item_func::eq() function employs my_strcasecmp() function to compare
used-defined stored functions names.
2007-03-07 22:11:57 +03:00