Commit graph

44536 commits

Author SHA1 Message Date
joerg@trift2.
2e5e79cf37 Merge trift2.:/MySQL/M51/mysql-5.1
into  trift2.:/MySQL/M51/push-5.1
2007-03-23 10:57:17 +01:00
tomas@whalegate.ndb.mysql.com
05984c7aeb Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-03-23 08:20:36 +01:00
dfischer/mysqldev@mysql.com/production.mysql.com
b9a317de70 Raise version number after cloning 5.1.17-beta 2007-03-23 07:27:46 +01:00
holyfoot/hf@mysql.com/hfmain.(none)
e06a8826c9 fixes to make embedded-server test working 2007-03-23 10:16:30 +04:00
stewart@willster.(none)
21e9072775 WL#3704 mgmapi timeouts: fix compile warning 2007-03-23 15:25:58 +11:00
omer@linux.site
cbdd03c5d5 Merge linux.site:/home/omer/source/bld50_0321
into  linux.site:/home/omer/source/bld51_0322
2007-03-22 14:49:25 -07:00
holyfoot/hf@mysql.com/hfmain.(none)
7eb78d8d04 merging 2007-03-23 01:46:02 +04:00
holyfoot/hf@hfmain.(none)
2a54dcd997 Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt
into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
2007-03-23 01:05:45 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
e1044ab5d1 merging 2007-03-23 01:04:31 +04:00
omer@linux.site
6592ecef8b Merge obarnir@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  linux.site:/home/omer/source/bld50_0321
2007-03-22 13:49:47 -07:00
evgen@moonbone.local
a2219567a1 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  moonbone.local:/mnt/gentoo64/work/26813-bug-5.0-opt-mysql
2007-03-22 23:15:30 +03:00
evgen@moonbone.local
38e023781a sql_view.cc:
Post-fix for bug#26813.
2007-03-22 23:13:40 +03:00
holyfoot/hf@hfmain.(none)
a7f5f07b6f Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt
into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
2007-03-23 00:09:12 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
fc23f3356e Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt
2007-03-23 00:04:47 +04:00
holyfoot/hf@hfmain.(none)
81b59fb3cc Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt
into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
2007-03-22 23:59:20 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
68f9ff123c Merge bk@192.168.21.1:mysql-5.0-opt
into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt
2007-03-22 23:54:47 +04:00
holyfoot/hf@hfmain.(none)
0d55666960 Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt
into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
2007-03-22 23:51:09 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
e556a0431b Merge mysql.com:/home/hf/work/mrg/mysql-4.1-opt
into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt
2007-03-22 23:50:33 +04:00
holyfoot/hf@hfmain.(none)
09d4529457 Merge bk@192.168.21.1:mysql-5.1
into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
2007-03-22 23:49:44 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
0102d38ef4 Merge bk@192.168.21.1:mysql-5.0
into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt
2007-03-22 23:48:39 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
1d0efa1757 Merge bk@192.168.21.1:mysql-4.1
into  mysql.com:/home/hf/work/mrg/mysql-4.1-opt
2007-03-22 23:45:37 +04:00
evgen@moonbone.local
b1f852b901 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  moonbone.local:/mnt/gentoo64/work/26813-bug-5.0-opt-mysql
2007-03-22 22:15:21 +03:00
evgen@moonbone.local
1ac5987ae2 Bug#26813: The SUPER privilege is wrongly required to alter a view created by
another user.

When the DEFINER clause isn't specified in the ALTER statement then it's loaded
from the view definition. If the definer differs from the current user then
the error is thrown because only a super-user can set other users as a definers.

Now if the DEFINER clause is omitted in the ALTER VIEW statement then the
definer from the original view is used without check.
2007-03-22 22:05:19 +03:00
kent@kent-amd64.(none)
9ed4f86eaf Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
2007-03-22 19:44:14 +01:00
kent@mysql.com/kent-amd64.(none)
b961d9dc06 Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
2007-03-22 19:43:41 +01:00
kent@mysql.com/kent-amd64.(none)
a55735b964 .del-fill_func_tables.sh:
Delete: scripts/fill_func_tables.sh
.del-fill_help_tables.sh:
  Delete: scripts/fill_help_tables.sh
.del-internals.texi:
  Delete: Docs/internals.texi
2007-03-22 19:43:15 +01:00
kent@kent-amd64.(none)
b2e2a96c1d Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
2007-03-22 19:42:20 +01:00
kent@mysql.com/kent-amd64.(none)
1fece4b1b3 Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
2007-03-22 19:39:54 +01:00
kent@mysql.com/kent-amd64.(none)
e15c8e7854 Merge mysql.com:/home/kent/bk/tmp/mysql-4.0
into  mysql.com:/home/kent/bk/tmp/mysql-4.1-build
2007-03-22 19:39:23 +01:00
kent@mysql.com/kent-amd64.(none)
aee762b25e Deleted directories
Docs/Books/
  Docs/MySQL-logos/
Deleted files
  Docs/Tutorial-MySQL-final.txt
  Docs/bk.txt
  Docs/Support/.cvsignore
  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/trivial-makeinfo-4.0c.patch
  Docs/Support/xwf
Deleted file now in internals main text
  Docs/my_sys.txt
Deleted file now in internals svn tree
  Docs/net_doc.txt
Removed obsolete entries
  Docs/.cvsignore
Added note that info is obsolete
  Docs/linuxthreads.txt
2007-03-22 19:38:56 +01:00
tsmith@siva.hindu.god
de07f782a9 Merge siva.hindu.god:/home/tsmith/m/bk/maint/50
into  siva.hindu.god:/home/tsmith/m/bk/maint/51
2007-03-22 11:48:49 -06:00
gkodinov/kgeorge@magare.gmz
70d91d43ae Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/autopush/B26207-5.0-opt
2007-03-22 18:49:47 +02:00
gkodinov/kgeorge@magare.gmz
ef1bb48af9 Bug #26207: When making the key image to use
in index search MySQL was not explicitly
 suppressing warnings. And if the context 
 happens to enable warnings (e.g. INSERT ..
 SELECT) the warnings resulting from converting 
 the data the key is compared to are 
 reported to the client.
 Fixed by suppressing warnings when converting
 the data to the same type as the key parts.
2007-03-22 18:44:16 +02:00
kent@kent-amd64.(none)
5018fa3638 Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
2007-03-22 16:58:46 +01:00
kent@mysql.com/kent-amd64.(none)
056356db05 Makefile.am:
Don't install benchmark executable
CMakeLists.txt:
  Handle CMAKE_C_FLAGS_RELWITHDEBINFO and CMAKE_CXX_FLAGS_RELWITHDEBINFO
2007-03-22 16:53:37 +01:00
mhansson/martin@linux-st28.site
99ac24679d Bug#24791: Union with AVG-groups generates wrong results
Patch appled after doing a pull from the team tree. Additional tests had to be
fixed
2007-03-22 14:58:43 +01:00
mhansson/martin@linux-st28.site
cdf80a269b Merge mhansson@bk-internal:/home/bk/mysql-5.0-opt
into  linux-st28.site:/home/martin/mysql/src/5.0o-bug24791
2007-03-22 13:37:27 +01:00
stewart@willster.(none)
cec607ab1c Merge willster.(none):/home/stewart/Documents/MySQL/5.1/ndb
into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-work
2007-03-22 23:20:43 +11:00
tomas@whalegate.ndb.mysql.com
e44d030bc1 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-03-22 13:20:42 +01:00
tomas@whalegate.ndb.mysql.com
424f82d39a Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-03-22 13:17:40 +01:00
tomas@whalegate.ndb.mysql.com
f7e4428438 BUG#27044 bug fix of 27320 fixes this, added test case 2007-03-22 13:17:08 +01:00
tomas@whalegate.ndb.mysql.com
fcbdc84ade Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-03-22 12:55:32 +01:00
tomas@whalegate.ndb.mysql.com
cb4d64ad6c Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-03-22 12:55:08 +01:00
tomas@whalegate.ndb.mysql.com
8791870d63 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
2007-03-22 12:47:20 +01:00
tomas@whalegate.ndb.mysql.com
a449d1de33 Bug #27320 ndb handler does not reset extra flags on reset()
- make sure all extra flags are reset
2007-03-22 12:42:13 +01:00
stewart@mysql.com[stewart]
7256b93b2e [PATCH] WL#3704 mgmapi timeouts: Fix error insert to NOT_STARTED nodes
Turns out I broke it.

Index: ndb-work/storage/ndb/src/mgmsrv/MgmtSrvr.cpp
===================================================================
2007-03-22 22:36:43 +11:00
stewart@mysql.com[stewart]
f40d852fcc [PATCH] WL#3704 mgmapi timeouts: Print full error from mgmd in NdbRestarter errors
Turns out they can be useful in working out what's going wrong.

Index: ndb-work/storage/ndb/test/src/NdbRestarter.cpp
===================================================================
2007-03-22 22:36:31 +11:00
stewart@mysql.com[stewart]
4df1bd9c10 [PATCH] WL#3704 mgmapi timeouts: Fix infinite (0) timeout for ndb_logevent_get_next
Index: ndb-work/storage/ndb/src/mgmapi/ndb_logevent.cpp
===================================================================
2007-03-22 22:36:19 +11:00
stewart@mysql.com[stewart]
471469a674 [PATCH] WL#3704 mgmapi timeouts: For mgm server, have timeout per operation, not for entire connection (i.e. fix the bug)
for TransporterRegistry, keep connection to management server alive.


Index: ndb-work/storage/ndb/include/util/InputStream.hpp
===================================================================
2007-03-22 22:36:07 +11:00
stewart@mysql.com[stewart]
75cff8cd26 [PATCH] WL#3704 mgmapi timeouts: Correct cpc client usage of Socket Input/OutputStream for timeouts
Index: ndb-work/storage/ndb/include/util/InputStream.hpp
===================================================================
2007-03-22 22:35:55 +11:00