summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* subselect.result:evgen@moonbone.local2007-04-151-2/+2
| | | | After merge fix.
* Merge moonbone.local:/mnt/gentoo64/work/27321-bug-5.0-opt-mysqlevgen@moonbone.local2007-04-158-85/+246
|\ | | | | | | into moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.1-opt
| * item.cc:evgen@moonbone.local2007-04-151-1/+1
| | | | | | | | Fix warning after fix for bug#27321.
| * subselect.test, subselect.result:evgen@moonbone.local2007-04-152-0/+2
| | | | | | | | After merge fix.
| * Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-optevgen@moonbone.local2007-04-158-87/+245
| |\ | | | | | | | | | into moonbone.local:/mnt/gentoo64/work/27321-bug-5.0-opt-mysql
| | * Bug#27321: Wrong subquery result in a grouping select.evgen@moonbone.local2007-04-158-92/+248
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Item_outer_ref class based on the Item_direct_ref class was always used to represent an outer field. But if the outer select is a grouping one and the outer field isn't under an aggregate function which is aggregated in that outer select an Item_ref object should be used to represent such a field. If the outer select in which the outer field is resolved isn't grouping then the Item_field class should be used to represent such a field. This logic also should be used for an outer field resolved through its alias name. Now the Item_field::fix_outer_field() uses Item_outer_field objects to represent aliased and non-aliased outer fields for grouping outer selects only. Now the fix_inner_refs() function chooses which class to use to access outer field - the Item_ref or the Item_direct_ref. An object of the chosen class substitutes the original field in the Item_outer_ref object. The direct_ref and the found_in_select_list fields were added to the Item_outer_ref class.
* | | Merge mysql.com:/d2/hf/mrg/mysql-5.0-optholyfoot/hf@hfmain.(none)2007-04-140-0/+0
|\ \ \ | |/ / | | | | | | into mysql.com:/d2/hf/mrg/mysql-5.1-opt
| * | Merge mysql.com:/d2/hf/mrg/mysql-4.1-optholyfoot/hf@mysql.com/hfmain.(none)2007-04-140-0/+0
| |\ \ | | | | | | | | | | | | into mysql.com:/d2/hf/mrg/mysql-5.0-opt
| | * \ Merge bk@192.168.21.1:mysql-4.1holyfoot/hf@mysql.com/hfmain.(none)2007-04-149-20/+206
| | |\ \ | | | | | | | | | | | | | | | into mysql.com:/d2/hf/mrg/mysql-4.1-opt
| * | \ \ Merge bk@192.168.21.1:mysql-5.0holyfoot/hf@mysql.com/hfmain.(none)2007-04-1495-761/+5500
| |\ \ \ \ | | | | | | | | | | | | | | | | | | into mysql.com:/d2/hf/mrg/mysql-5.0-opt
* | \ \ \ \ Merge bk@192.168.21.1:mysql-5.1holyfoot/hf@hfmain.(none)2007-04-14110-1845/+39567
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into mysql.com:/d2/hf/mrg/mysql-5.1-opt
| * \ \ \ \ \ Merge trift2.:/MySQL/M50/push-5.0joerg@trift2.2007-04-120-0/+0
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | into trift2.:/MySQL/M51/push-5.1
| | * | | | | Merge trift2.:/MySQL/M41/push-4.1joerg@trift2.2007-04-120-0/+0
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | into trift2.:/MySQL/M50/push-5.0
| | | * | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1kent@mysql.com/kent-amd64.(none)2007-04-115-635/+0
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/tmp3/mysql-4.1-build
| | | | * \ \ \ Merge trift2.:/MySQL/M41/mysql-4.1joerg@trift2.2007-04-075-635/+0
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into trift2.:/MySQL/M41/push-4.1
| | * | | \ \ \ \ Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-builddf@pippilotta.erinye.com2007-04-112-1/+25
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
| | | * \ \ \ \ \ \ Merge ↵df@pippilotta.erinye.com2007-04-111-0/+24
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-25601 into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
| | | * \ \ \ \ \ \ \ Merge ↵df@pippilotta.erinye.com2007-04-111-1/+1
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-36sp1 into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
| * | | | | | | | | | | don't copy pdb files from the release target output folder, since this ↵df@pippilotta.erinye.com2007-04-111-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | target does not build them
| * | | | | | | | | | | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-builddf@pippilotta.erinye.com2007-04-110-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
| | * | | | | | | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0kent@mysql.com/kent-amd64.(none)2007-04-1194-760/+5475
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/tmp3/mysql-5.0-build
| * | | | | | | | | | | Merge ↵df@pippilotta.erinye.com2007-04-111-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-36sp1 into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
| | * | | | | | | | | | make configure handle service pack version stringsdf@pippilotta.erinye.com2007-04-111-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Merge ↵df@pippilotta.erinye.com2007-04-111-0/+24
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-25601 into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
| | * \ \ \ \ \ \ \ \ \ \ Merge ↵df@pippilotta.erinye.com2007-03-091-0/+24
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-25601 into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-25601
| | | * | | | | | | | | | BUG#25601 Missing m4 macro MYSQL_CHECK_TIME_Tdf@pippilotta.erinye.com2007-03-091-0/+24
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-builddf@pippilotta.erinye.com2007-04-114-22/+59
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
| | * \ \ \ \ \ \ \ \ \ \ \ Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-releasedf@pippilotta.erinye.com2007-04-104-22/+59
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
| | | * | | | | | | | | | | | add a manual page backdf@pippilotta.erinye.com2007-04-101-0/+1
| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | remove manual pages that don't exist from rpm spec filedf@pippilotta.erinye.com2007-04-051-2/+4
| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | build fixes for 5.1.17df@pippilotta.erinye.com2007-04-042-7/+29
| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | fix previous mysqlbinlog test case fixdf@pippilotta.erinye.com2007-04-022-8/+8
| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | BUG#25303 log_state failsdf@pippilotta.erinye.com2007-04-021-1/+1
| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | BUG#27489 build fixdf@pippilotta.erinye.com2007-04-021-14/+29
| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | build fix for bug#27049df@pippilotta.erinye.com2007-04-021-1/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1kent@kent-amd64.(none)2007-04-11105-1822/+39476
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/tmp3/mysql-5.1-build
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/kent/bk/tmp3/mysql-5.0-buildkent@kent-amd64.(none)2007-04-112-9/+10
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | / / / / / / / | | | | |_|_|_|_|/ / / / / / / | | | |/| | | | | | | | | | | into mysql.com:/home/kent/bk/tmp3/mysql-5.1-build
| | | * | | | | | | | | | | | my_memmem.c:kent@mysql.com/kent-amd64.(none)2007-04-113-10/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Back port of include change and copyright from 5.1 Makefile.am, zlib.m4: Use separate libtool convenience library for the bundled zlib to embed into executables and shared libraries created, and one to install into the pkglib directory
| | | * | | | | | | | | | | | Merge trift2.:/MySQL/M50/mysql-5.0joerg@trift2.2007-04-0793-752/+5450
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into trift2.:/MySQL/M50/push-5.0
| | * | \ \ \ \ \ \ \ \ \ \ \ \ Merge trift2.:/MySQL/M51/mysql-5.1joerg@trift2.2007-04-07105-1815/+39468
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into trift2.:/MySQL/M51/push-5.1
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/tmp/mysql-5.0-buildkent/kboortz@production.mysql.com2007-04-0784-2/+5378
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/tmp/mysql-5.1-build
| | | | * | | | | | | | | | | | | mysql.spec.sh:kent/kboortz@mysql.com/production.mysql.com2007-04-071-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed man page for "mysql_create_system_tables"
| | | | * | | | | | | | | | | | | test of row locking.hhunger@hh-nb.hungers2007-04-0583-0/+5364
| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | changed supported sql function to inpuzt files.hhunger@hh-nb.hungers2007-04-0518-1808/+34069
| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Merge mysql.com:/home/kent/bk/sotest/mysql-5.0-buildkent@kent-amd64.(none)2007-04-053-4/+20
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/sotest/mysql-5.1-build
| | | | * | | | | | | | | | | | | zlib.m4:kent@mysql.com/kent-amd64.(none)2007-04-054-6/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only require the more recent zlibCompileFlags() when building the server, client zlib don't need it. Makefile.am: Always build the bundled zlib static only configure.in: Look for dlopen() even if --with-mysqld-ldflags constains "-static", as this is not the same as the flag to "ld", it just informs "libtool" to link static with libraries created part of the build, even if there exists shared versions. make_binary_distribution.sh: Real "mysqlmanager" executable might be in ".libs"
| | | | * | | | | | | | | | | | | Merge mysql.com:/home/kent/bk/sotest/mysql-4.1-buildkent@mysql.com/kent-amd64.(none)2007-04-055-635/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|/ / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/sotest/mysql-5.0-build
| | | | | * | | | | | | | | | | | Deleted reject files accidently checked inkent@mysql.com/kent-amd64.(none)2007-04-055-635/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configure.in.rej include/my_global.h.rej BUILD/SETUP.sh.rej mysys/thr_alarm.c.rej include/my_pthread.h.rej
| | | | * | | | | | | | | | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0kent@mysql.com/kent-amd64.(none)2007-04-051-110/+60
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/sotest/mysql-5.0-build
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0df@pippilotta.erinye.com2007-04-031-110/+60
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build