mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 19:41:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
36929 commits 2793 branches 343 tags 1.7 GiB
Commit graph

36929 commits

This branch
This branch
All branches
Author SHA1 Message Date
cmiller@zippy.cornsilk.net
543fcde9b9 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0
 2006-08-09 22:23:41 -04:00
evgen@moonbone.local
2e7f47c6f8 sql_base.cc, table.cc: 
After merge fix
 2006-08-10 00:37:08 +04:00
andrey@lmy004.
9a325ac786 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  lmy004.:/work/mysql-5.1-runtime
 2006-08-09 17:19:39 +02:00
andrey@lmy004.
76ff7fb78f Fix for bug#20701 BINARY keyword should be forbidden in stored routines 
create function func() returns char(10) binary ...
is no more possible. This will be reenabled when 
bug 2676 "DECLARE can't have COLLATE clause in stored procedure"
is fixed.

Fix after 2nd review
 2006-08-09 17:07:59 +02:00
jonas@perch.ndb.mysql.com
a2f1b78083 ndb - bug#21536 
Make sure updateNodeInfo is run on master also for temporary tables
 2006-08-09 16:24:14 +02:00
mskold/marty@mysql.com/linux.site
794c874853 bug #18184 SELECT ... FOR UPDATE does not work..: Updated result file 2006-08-09 16:12:24 +02:00
mskold/marty@linux.site
c3da14f4c5 Merge mysql.com:/home/marty/MySQL/mysql-5.0 
into  mysql.com:/home/marty/MySQL/mysql-5.1-ndb
 2006-08-09 15:02:30 +02:00
kroki/tomash@moonlight.intranet
e79876362e Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-rt-merge
 2006-08-09 16:42:21 +04:00
kroki/tomash@moonlight.intranet
216ba85296 Post-merge fix. 2006-08-09 16:37:26 +04:00
mskold/marty@mysql.com/linux.site
b36bcc316a Fix for bug #21059 Server crashes on join query with large dataset with NDB tables: added more tests 2006-08-09 14:32:56 +02:00
kroki/tomash@moonlight.intranet
5c272816ca Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge
 2006-08-09 13:37:20 +04:00
svoj@may.pils.ru
5f3d231f57 Merge may.pils.ru:/home/svoj/devel/mysql/BUG20060/mysql-4.1 
into  may.pils.ru:/home/svoj/devel/mysql/BUG20060/mysql-5.0
 2006-08-09 14:33:45 +05:00
svoj@may.pils.ru
81b70f9798 BUG#20060 - mysqld option "--flush " doesn't work for update statement 
Problem described in this bug report affects MyISAM tables only.

Running mysqld --flush instructs mysqld to sync all changes to disk
after each SQL statement. It worked well for INSERT and DELETE
statements, but it did sync for UPDATE only in case if there was
index change (change of colum that has an index). If no updated column
has an index, data wasn't synced to disk.

This fix makes UPDATE statement to sync data to disk even if there is
no index change (that is only data change) and mysqld is run with
--flush option.
 2006-08-09 14:28:39 +05:00
jonas@perch.ndb.mysql.com
f6772782a6 ndb - bug#21363 
add file that got missing from last changset
 2006-08-09 10:41:22 +02:00
jonas@perch.ndb.mysql.com
3a7d3f20f1 ndb - bug#21363 
Add extra sleeps (conditionally) if user-ndb-object still exists during shutdown
  Note: This is not in anyway optimal, but i dont't really know in which order should be shutdown
        but it fixes problem...
 2006-08-09 10:22:09 +02:00
stewart@willster.(none)
76d4e65adb remove undeeded printing of newline. 2006-08-09 15:39:32 +08:00
stewart@willster.(none)
37d8c78036 BUG#13985 
fixups after review by jonas
 2006-08-09 15:03:55 +08:00
evgen@sunlight.local
6691c62310 sql_view.cc: 
After merge fix
 2006-08-09 06:46:06 +04:00
evgen@sunlight.local
0d6996010c Merge sunlight.local:/local_work/leak_fix_orig 
into  sunlight.local:/local_work/leak_fix-5.1-mysql
 2006-08-09 02:49:29 +04:00
evgen@sunlight.local
95713e9896 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  sunlight.local:/local_work/leak_fix
 2006-08-09 01:45:42 +04:00
evgen@sunlight.local
b5a5cb4ad7 Merge sunlight.local:/home/evgen/bk-trees/mysql-5.0 
into  sunlight.local:/local_work/leak_fix
 2006-08-09 01:43:11 +04:00
patg@govinda.patg.net
21f7f34776 BUG #21524 "'ps' test fails in --ps-protocol test AMD64 bit" 
(this is not a fix to the bug, but simply to disable the test in 
order to push a 5.0 to 5.1 merge)

This merge contains:

Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006:

bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge
 2006-08-08 14:32:39 -07:00
evgen@sunlight.local
1250b06ac9 sql_base.cc, unireg.h, sql_lex.h, table.cc, sql_view.h, sql_view.cc: 
Correct memory leak fix
 2006-08-09 00:05:42 +04:00
patg@govinda.patg.net
8d1e5a5bb1 Merge govinda.patg.net:/home/patg/mysql-build/mysql-5.0-holyfoot 
into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-5.0-merge2

Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006:

bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge
 2006-08-08 09:01:32 -07:00
mskold/marty@mysql.com/linux.site
9241fba4ae Merge mysql.com:/home/marty/MySQL/mysql-4.1 
into  mysql.com:/home/marty/MySQL/mysql-5.0
 2006-08-08 14:42:05 +02:00
mskold/marty@mysql.com/linux.site
a922e328af bug #18184 SELECT ... FOR UPDATE does not work..: Added lockTuple call in close_scan 2006-08-08 12:22:23 +02:00
petr/cps@mysql.com/owlet.
5431ecb593 Fix windows pushbuild failure: the bug occured because 
we didn't check for NULL value of the
lex_create_info->db_type pointer.
The pointer is NULL in the case, when the engine name is
unknown to the server. This happens with NDB on Windows.
 2006-08-08 12:03:24 +04:00
stewart@willster.(none)
c709602124 Merge willster.(none):/home/stewart/Documents/MySQL/5.0/main 
into  willster.(none):/home/stewart/Documents/MySQL/5.0/bug13985
 2006-08-08 14:40:40 +08:00
jonas@perch.ndb.mysql.com
877950b610 Merge perch.ndb.mysql.com:/home/jonas/src/41-work 
into  perch.ndb.mysql.com:/home/jonas/src/50-work
 2006-08-08 08:00:22 +02:00
jonas@perch.ndb.mysql.com
c2ad5b4ba0 ndb - bug#21213 
Make sure totSendlenAi is set in case of ACC_ABORTCONF and activeCreate == true
  (only needed when >2 replica)
 2006-08-08 07:59:52 +02:00
stewart@willster.(none)
e95a60727f Merge willster.(none):/home/stewart/Documents/MySQL/5.0/main 
into  willster.(none):/home/stewart/Documents/MySQL/5.0/bug13985
 2006-08-08 11:59:21 +08:00
mskold/marty@mysql.com/linux.site
a51106f003 Fix for bug #21059 Server crashes on join query with large dataset with NDB tables: missing friend declaration in change set 2006-08-07 15:58:43 +02:00
mskold/marty@mysql.com/linux.site
d7f8c331e1 Fix for bug #21059 Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit); 2006-08-07 14:48:54 +02:00
mskold/marty@mysql.com/linux.site
94f1e8b75a Merge mysql.com:/home/marty/MySQL/mysql-4.1 
into  mysql.com:/home/marty/MySQL/mysql-5.0
 2006-08-07 14:43:29 +02:00
jonas@perch.ndb.mysql.com
96cfb19175 ndb - bug#21478 
make fragment logpart in DIH "global"
 2006-08-07 14:32:43 +02:00
jonas@perch.ndb.mysql.com
4db1bba0d0 ndb - bug#21271 
make each fragment use own LCP file, so that (s/n)r can use different LCP-no for different fragments
 2006-08-07 14:28:58 +02:00
mskold/marty@mysql.com/linux.site
3c61424563 Fix for bug #21059 Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit); 2006-08-07 13:51:20 +02:00
jonas@perch.ndb.mysql.com
9cc27b6773 ndb - some hugo updates 
make dump state args list const
  make node lists const
 2006-08-07 12:12:55 +02:00
jonas@perch.ndb.mysql.com
7037fd564b Merge perch.ndb.mysql.com:/home/jonas/src/41-work 
into  perch.ndb.mysql.com:/home/jonas/src/50-work
 2006-08-07 09:49:46 +02:00
jonas@perch.ndb.mysql.com
8754e59a8f ndb - bug#18475 
Fix error message on copyfragref
 2006-08-07 09:41:39 +02:00
evgen@sunlight.local
00399c0076 sql_view.cc: 
Memory leak fix
 2006-08-07 07:41:49 +04:00
evgen@sunlight.local
a73d90e705 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  sunlight.local:/local_work/leak_fix
 2006-08-07 02:29:59 +04:00
evgen@sunlight.local
f72600ca39 Merge sunlight.local:/home/evgen/bk-trees/mysql-5.0 
into  sunlight.local:/local_work/leak_fix
 2006-08-07 00:06:54 +04:00
evgen@sunlight.local
854245e715 sql_view.cc: 
Memory leak fix
 2006-08-07 00:06:03 +04:00
jonas@perch.ndb.mysql.com
e32d7bced8 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2006-08-04 21:02:28 +02:00
jonas@perch.ndb.mysql.com
50440fb32e Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
 2006-08-04 20:56:27 +02:00
andrey@lmy004.
9c59cfe4d7 Fix for bug#21416 SP: Recursion level higher than zero needed for non-recursive call 
The following procedure was not possible if max_sp_recursion_depth is 0
create procedure show_proc() show create procedure show_proc;

Actually there is no recursive call but the limit is checked.

Solved by temporarily increasing the thread's limit just before the fetch from cache
and decreasing after that.
 2006-08-04 12:50:49 +02:00
petr/cps@owlet.
af461de728 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  mysql.com:/home/cps/mysql/devel/5.1-curs-bug
 2006-08-04 14:48:51 +04:00
jonas@perch.ndb.mysql.com
ef01ad4d07 ndb - bug#21044 
report only once on "all dump 1000"
 2006-08-04 10:42:04 +02:00
jonas@perch.ndb.mysql.com
b6f2e59529 ndb - bug#21129 
add missing function to mgmapi
 2006-08-04 10:30:57 +02:00