joerg@trift2.
5de0159493
Merge trift2.:/MySQL/M51/clone-5.1
...
into trift2.:/MySQL/M51/push-5.1
This is mysql-5.1.22-rc.
2007-09-28 20:33:46 +02:00
joerg@trift2.
2b86686dab
Preliminary fix for
...
Bug #30759 mysql_install_db fails to set $extra_bindir properly in all cases.
2007-09-28 17:33:14 +02:00
kent@kent-amd64.(none)
ca8bb3d96f
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build
...
into mysql.com:/home/kent/bk/make-dist-stable/mysql-5.1-build
2007-09-27 21:40:07 +02:00
kent@mysql.com/kent-amd64.(none)
96b62a5c13
Makefile.am, configure.in:
...
Handle pstack like other optional directories
Check if a directory exists relative to $srcdir
2007-09-27 21:39:23 +02:00
joerg@trift-lap.fambruehe
6aa39a1cf6
Merge trift-lap.fambruehe:/MySQL/M51/push-5.1
...
into trift-lap.fambruehe:/MySQL/M51/antony-5.1
2007-09-27 16:51:40 +02:00
df@pippilotta.erinye.com
a02d8a5d06
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-09-27 10:01:28 +02:00
df@pippilotta.erinye.com
9edb893f95
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-09-27 09:49:46 +02:00
df@pippilotta.erinye.com
17fb92cce4
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-vista
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-09-27 09:46:28 +02:00
df@pippilotta.erinye.com
59f9885bb4
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-vista
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-09-27 09:42:54 +02:00
df@pippilotta.erinye.com
14e602e9e4
avoid using GetTempFileName in a way it's documented to not work on windows
2007-09-27 08:56:06 +02:00
kent@mysql.com/kent-amd64.(none)
1e5c06ea34
Makefile.am:
...
Corrected typo
2007-09-26 19:41:46 +02:00
kent@kent-amd64.(none)
c7c8f41894
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build
...
into mysql.com:/home/kent/bk/make-dist-stable/mysql-5.1-build
2007-09-26 18:49:09 +02:00
kent@mysql.com/kent-amd64.(none)
1b53e4a547
Makefile.am:
...
Always include all sub directories in "make dist"
Removed incorrect comment
configure.in:
Unconditionally list make files in AC_CONFIG_FILES
Removed 'thread_dirs', it is not used
Minor cleanup
compile-dist:
Simplified the configure line needed for "make dist" to get it all
zlib.m4, ssl.m4:
Unconditionally list make files in AC_CONFIG_FILES
Makefile.am:
Removed DIST_SUBDIRS not needed
Don't copy soft links as files into source package
2007-09-26 18:47:55 +02:00
df@pippilotta.erinye.com
7ef6e66bc6
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-09-25 17:53:01 +02:00
df@pippilotta.erinye.com
43310df9d9
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-09-25 17:44:53 +02:00
df@pippilotta.erinye.com
461f559adf
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-09-25 17:42:25 +02:00
joerg@trift-lap.fambruehe
a81116eef8
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-target-5.1.22
...
into trift-lap.fambruehe:/MySQL/M51/antony-5.1
2007-09-24 15:33:46 +02:00
jperkin@production.mysql.com
d6db96fb55
Merge production.mysql.com:/usersnfs/jperkin/bk/build-5.0
...
into production.mysql.com:/usersnfs/jperkin/bk/build-5.1
2007-09-24 11:48:27 +02:00
mats@kindahl-laptop.dnsalias.net
983de3e27c
Merge kindahl-laptop.dnsalias.net:/home/bk/b31076-mysql-5.1-rpl
...
into kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-release
2007-09-24 10:53:41 +02:00
mats@kindahl-laptop.dnsalias.net
b2f5b2e83d
BUG#31076 (Server crashes when start slave is issued):
...
Second patch to initailize more uninitialized variables.
2007-09-24 10:50:57 +02:00
jonathan@bagpuss.adsl.perkin.org.uk
3b3be2ada1
Revert previous attempt to fix bug#27693, the files removed from the
...
cmake list are auto-generated and thus still required. Correct fix
not yet known.
2007-09-22 16:29:15 +02:00
gkodinov/kgeorge@macbook.local
ed7e4b82c1
fixed warnings by bug 30639
2007-09-21 12:17:09 +02:00
gkodinov/kgeorge@macbook.local
4eee02dd3d
fixed type conversion warnings revealed by bug 30639
2007-09-21 10:15:16 +02:00
mats@kindahl-laptop.dnsalias.net
8aa3bb0418
Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-release
...
into kindahl-laptop.dnsalias.net:/home/bk/b31076-mysql-5.1-release
2007-09-20 16:38:36 +02:00
mats@kindahl-laptop.dnsalias.net
c5622b424f
BUG#31076 (Server crashes when start slave is issued):
...
Row-based replication crashes when replicating from pre-5.1.22 to 5.1.22
due to an uninitialized variable.
2007-09-20 16:31:05 +02:00
gluh@eagle.(none)
7dbcdf9a64
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-09-20 16:28:46 +05:00
gluh@mysql.com/eagle.(none)
eef0772b89
result fix
2007-09-20 16:27:58 +05:00
gluh@eagle.(none)
2a02dd13e2
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-09-20 14:40:24 +05:00
gluh@mysql.com/eagle.(none)
4ffcc4f266
result fix
2007-09-20 14:38:41 +05:00
gluh@eagle.(none)
88a4df4ec0
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-09-20 14:10:05 +05:00
gluh@mysql.com/eagle.(none)
6b81174cde
Bug#27747 database metadata doesn't return sufficient column default info
...
added get_field_default_value() function which obtains default value from the field
(used in store_create_info() & get_schema_column_record() functions)
2007-09-20 13:54:46 +05:00
gkodinov/kgeorge@magare.gmz
3dd2ed30ae
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B30639-5.1-opt
2007-09-19 18:02:59 +03:00
gkodinov/kgeorge@magare.gmz
c2abf960f9
Bug #30639 : limit offset,rowcount wraps when rowcount >= 2^32 in windows
...
The parser uses ulonglong to store the LIMIT number. This number
then is stored into a variable of type ha_rows. ha_rows is either
4 or 8 byte depending on the BIG_TABLES define from config.h
So an overflow may occur (and LIMIT becomes zero) while storing an
ulonglong value in ha_rows.
Fixed by :
1. Using the maximum possible value for ha_rows on overflow
2. Defining BIG_TABLES for the windows builds (to match the others)
2007-09-19 17:47:52 +03:00
gluh@eagle.(none)
7c87dc6e52
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-09-19 14:10:01 +05:00
gluh@eagle.(none)
e7a9c4d648
Merge mysql.com:/home/gluh/MySQL/Merge/5.1
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-09-19 14:09:23 +05:00
gluh@eagle.(none)
56c927e696
Merge mysql.com:/home/gluh/MySQL/Merge/5.0
...
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
2007-09-19 13:50:38 +05:00
gshchepa@devsrv-b.mysql.com
2e26008c3e
Many files:
...
Post-merge fix.
2007-09-15 07:39:58 +02:00
gshchepa@devsrv-b.mysql.com
6234432241
Merge devsrv-b.mysql.com:/data0/gshchepa/mysql-5.0-opt
...
into devsrv-b.mysql.com:/data0/gshchepa/mysql-5.1-opt
2007-09-15 07:08:07 +02:00
gshchepa@devsrv-b.mysql.com
0aa6e95768
select.test:
...
Post-fix for bug#27695.
2007-09-15 07:04:32 +02:00
gkodinov/kgeorge@magare.gmz
3b58ae43c8
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B31001-5.1-opt
2007-09-14 23:48:23 +03:00
gshchepa@devsrv-b.mysql.com
3dc13a6444
Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into devsrv-b.mysql.com:/data0/gshchepa/mysql-5.1-opt
2007-09-14 21:17:07 +02:00
gshchepa@devsrv-b.mysql.com
4bf2408ed4
Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into devsrv-b.mysql.com:/data0/gshchepa/mysql-5.0-opt
2007-09-14 21:15:43 +02:00
joerg@trift2.
f724efee59
Merge trift2.:/MySQL/M50/push-5.0
...
into trift2.:/MySQL/M51/push-5.1
2007-09-14 19:52:07 +02:00
joerg@trift2.
0cdf470a2e
Merge trift2.:/MySQL/M41/push-4.1
...
into trift2.:/MySQL/M50/push-5.0
2007-09-14 19:47:38 +02:00
joerg@trift2.
8fd3d71109
Merge trift2.:/MySQL/M51/mysql-5.1
...
into trift2.:/MySQL/M51/push-5.1
2007-09-14 19:29:26 +02:00
joerg@trift2.
100f69154d
Merge trift2.:/MySQL/M50/mysql-5.0
...
into trift2.:/MySQL/M50/push-5.0
2007-09-14 19:23:05 +02:00
joerg@trift2.
e78513165c
Merge trift2.:/MySQL/M41/mysql-4.1
...
into trift2.:/MySQL/M41/push-4.1
2007-09-14 19:21:02 +02:00
sergefp@mysql.com
df1eb8ac5d
Fix compile failure on windows
2007-09-14 21:15:57 +04:00
gkodinov/kgeorge@magare.gmz
0133bc639c
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B31001-5.0-opt
2007-09-14 19:04:47 +03:00
gkodinov/kgeorge@magare.gmz
6927e67dd9
Merge magare.gmz:/home/kgeorge/mysql/work/B31001-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/work/B31001-5.1-opt
2007-09-14 19:03:14 +03:00