mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-21 22:34:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
36101 commits 2781 branches 343 tags 1.6 GiB
Commit graph

36101 commits

This branch
This branch
All branches
Author SHA1 Message Date
msvensson@pilot.blaudden
6e4acae645 Merge pilot.blaudden:/home/msvensson/mysql/bug25262/my50-bug25262 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-25 12:08:39 +02:00
msvensson@pilot.blaudden
9bd17ef189 Merge pilot.blaudden:/home/msvensson/mysql/bug25118/my50-bug25118 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-24 13:59:44 +02:00
msvensson@pilot.blaudden
88ad41e256 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-24 13:06:58 +02:00
msvensson@pilot.blaudden
ffd0d33fd2 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-24 11:18:52 +02:00
msvensson@pilot.blaudden
f028e17ab7 Merge pilot.blaudden:/home/msvensson/mysql/bug14862/my50-bug14862 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-24 11:16:56 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
49b187034d Merge mysql.com:/home/ram/work/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b27515/b27515.5.0
 2007-04-24 14:08:03 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
d13861546e after-merge fix 2007-04-24 11:26:40 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
bb3b6ae72c Merge mysql.com:/home/ram/work/b27515/b27515.4.1 
into  mysql.com:/home/ram/work/b27515/b27515.5.0
 2007-04-24 10:27:59 +05:00
iggy@recycle.(none)
45400e5ca3 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  recycle.(none):/src/bug24732/my50-bug24732
 2007-04-23 21:49:26 -04:00
iggy@recycle.(none)
5cf930719f Bug#24732 Executables do not include Vista manifests 
- Correct PushBuild failure.
 2007-04-23 21:43:36 -04:00
iggy@recycle.(none)
4a50d613df Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  recycle.(none):/src/bug24732/my50-bug24732
 2007-04-23 16:36:40 -04:00
iggy@recycle.(none)
7a358c4b5c Bug#24732 Executables do not include Vista manifests 
- Added script to generate application specific manifest.
- Added new CMake MACRO to add customer build events which will first
generate a manifest and then embeds that manifest into an executable.
 2007-04-23 15:41:24 -04:00
tsmith@quadxeon.mysql.com
53985105f9 mysql_upgrade.test: 
Fix minor merge "oopsie"
 2007-04-23 21:27:43 +02:00
iggy@recycle.(none)
193e154ed4 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  recycle.(none):/src/bug25621/my50-bug25621
 2007-04-23 14:38:43 -04:00
iggy@recycle.(none)
30d6cf311a Bug#25621 Error in my_thread_global_end(): 1 threads didn't exit 
- On Windows, connection handlers while exiting properly did not 
decrement the server's thread count.
 2007-04-23 14:28:33 -04:00
msvensson@pilot.blaudden
4a1fd222ce Don't copy any subdirs in scripts/ 2007-04-23 18:16:57 +02:00
msvensson@pilot.blaudden
dcd914e24e Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-23 16:22:01 +02:00
msvensson@pilot.blaudden
1561c39c5d Add "name of struct" as first arg to comp_sql 
Fix "make distcheck"
 2007-04-23 14:01:48 +02:00
msvensson@pilot.blaudden
7ddc33753e Use a temp variable "error" for storing return code of pclose 
so the WEXITSTATUS macro can "fiddle" with it as it so pleases
 2007-04-23 13:27:55 +02:00
msvensson@pilot.blaudden
714c36ce27 It's not possible to use the return value of fputs 
to check if the creation of mysql_upgrade_info suceeded.
Instead use 'upgrade_already_done' to check that file was
created properly.
 2007-04-23 13:07:49 +02:00
msvensson@pilot.blaudden
b11a1c8fd4 Update test to work also when --pager does not exist in "mysql" 2007-04-23 12:58:35 +02:00
msvensson@pilot.blaudden
d1de41c59a Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-23 12:05:00 +02:00
msvensson@pilot.blaudden
10181a7fa7 Fix warnings reported by icc 2007-04-23 12:02:58 +02:00
msvensson@pilot.blaudden
a31fce0a6c Remove left over file abi_check 2007-04-23 11:46:47 +02:00
msvensson@pilot.blaudden
a23eeb620c Remove left over file fix_priv_tabs.result 2007-04-23 11:41:55 +02:00
msvensson@pilot.blaudden
7411813e48 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-23 11:03:40 +02:00
msvensson@pilot.blaudden
d26965c361 Protect against killing pid's that would "killall" or "kill self" 2007-04-23 11:01:22 +02:00
mjorgensen@blade09.mysql.com
121bc31b4a Merge bk-internal:/home/bk/mysql-5.0 
into  blade09.mysql.com:/tmp/mmj/mysql-5.0-runtime
 2007-04-21 18:36:06 +02:00
ibabaev@bk-internal.mysql.com
c09d1cfe92 Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-opt
 2007-04-21 00:36:21 +02:00
malff/marcsql@weblab.(none)
fc36313733 Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base 
into  weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge
 2007-04-20 15:34:04 -06:00
mtaylor@qualinost.(none)
0690dac3aa Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-maint 
into  qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-debian
 2007-04-20 14:09:43 -07:00
cmiller@zippy.cornsilk.net
219f3fb7c6 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2007-04-20 13:57:24 -04:00
cmiller@zippy.cornsilk.net
0b69216315 Avoid compiler warnings. 2007-04-20 13:49:06 -04:00
mats@romeo.(none)
f4c4de6a56 Added missing result file for rpl_critical_errors. 2007-04-20 14:08:12 +02:00
gshchepa/uchum@gshchepa.loc
6c5d17ef56 Merge gshchepa.loc:/home/uchum/work/bk-trees/mysql-5.0-opt 
into  gshchepa.loc:/home/uchum/work/bk-trees/mysql-5.0-opt-27704
 2007-04-20 16:44:50 +05:00
gshchepa/uchum@gshchepa.loc
4fcf1316bb Merge gshchepa.loc:/home/uchum/work/bk-trees/mysql-4.1-opt-27704 
into  gshchepa.loc:/home/uchum/work/bk-trees/mysql-5.0-opt-27704
 2007-04-20 15:31:33 +05:00
gshchepa/uchum@gshchepa.loc
f5a229b3d1 Bug#27704: incorrect comparison of rows with NULL components 
Support for NULL components was incomplete for row comparison,
fixed.  Added support for abort_on_null at compare_row() like
in 5.x
 2007-04-20 15:14:09 +05:00
gkodinov/kgeorge@magare.gmz
bcde01f6ff Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B27786-5.0-opt
 2007-04-20 12:01:54 +03:00
mhansson@dl145s.mysql.com
f0fc4b88e0 Bug #24778: Innodb: No result when using ORDER BY 
This bug was intruduced by the fix for bug#17212 (in 4.1). It is not 
ok to call test_if_skip_sort_order since this function will 
alter the execution plan. By contract it is not ok to call 
test_if_skip_sort_order in this context.

This bug appears only in the case when the optimizer has chosen 
an index for accessing a particular table but finds a covering 
index that enables it to skip ORDER BY. This happens in 
test_if_skip_sort_order.
 2007-04-20 11:01:53 +02:00
mats@romeo.(none)
f1caa9559c Merge romeo.(none):/home/bkroot/mysql-5.0-rpl 
into  romeo.(none):/home/bk/merge-mysql-5.0
 2007-04-20 10:35:27 +02:00
mats@romeo.(none)
bb73858835 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 
into  romeo.(none):/home/bkroot/mysql-5.0-rpl
 2007-04-20 10:28:44 +02:00
tomas@whalegate.ndb.mysql.com
fcb7246406 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-maint
 2007-04-20 10:03:18 +02:00
gkodinov/kgeorge@magare.gmz
4c89a5960f Bug #27786: 
When merging views into the enclosing statement
the ORDER BY clause of the view is merged to the
parent's ORDER BY clause.
However when the VIEW is merged into an UNION
branch the ORDER BY should be ignored. 
Use of ORDER BY for individual SELECT statements
implies nothing about the order in which the rows
appear in the final result because UNION by default
produces unordered set of rows.
Fixed by ignoring the ORDER BY clause from the merge
view when expanded in an UNION branch.
 2007-04-20 10:49:45 +03:00
msvensson@pilot.blaudden
71e58855bf Remove comment 2007-04-20 07:20:26 +02:00
mtaylor@qualinost.(none)
7e47a7c76b Change mode to -rw-rw-r-- 2007-04-19 21:59:25 -07:00
mtaylor@qualinost.(none)
4b820c5067 Made default changelog a little more generic. 2007-04-19 21:58:36 -07:00
mtaylor@blade09.mysql.com
5b3a22ecb6 control.in: 
Left a stray space in.
 2007-04-20 03:50:11 +02:00
mtaylor@blade09.mysql.com
007d2edc1c Makefile.am: 
Renamed libmysqlclient package entires
 2007-04-20 02:17:15 +02:00
mtaylor@blade09.mysql.com
d847f76f49 libmysqlclientSLIBoff.README.Debian.in: 
Rename: debian/libmysqlclientSLIB.README.Debian.in -> debian/libmysqlclientSLIBoff.README.Debian.in
libmysqlclientSLIBoff.docs.in:
  Rename: debian/libmysqlclientSLIB.docs.in -> debian/libmysqlclientSLIBoff.docs.in
control.in:
  Renamed packages back to libmysqlclientSLIBoff to match current packages. 
  We can rename this in a sensible way later on. 
libmysqlclientSLIBoff.files.in:
  Rename: debian/libmysqlclientSLIB.files.in -> debian/libmysqlclientSLIBoff.files.in
libmysqlclientSLIBoff.dirs.in:
  Rename: debian/libmysqlclientSLIB.dirs.in -> debian/libmysqlclientSLIBoff.dirs.in
libmysqlclientSLIBoff.postinst.in:
  Rename: debian/libmysqlclientSLIB.postinst.in -> debian/libmysqlclientSLIBoff.postinst.in
 2007-04-20 02:06:16 +02:00
tsmith@quadxeon.mysql.com
2272cad3f4 innodb_mysql.test, innodb_mysql.result: 
Fix test case: add drop table
 2007-04-20 00:20:57 +02:00