mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 11:01:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
39889 commits 2788 branches 343 tags 1.7 GiB
Commit graph

39889 commits

This branch
This branch
All branches
Author SHA1 Message Date
anozdrin/alik@alik.
643606cac9 Instance Manager polishing. 2006-10-20 22:26:40 +04:00
kent@mysql.com/c-544072d5.010-2112-6f72651.cust.bredbandsbolaget.se
60104e1132 make_win_bin_dist: 
Aligned script with updated 5.0 version
 2006-10-20 20:18:44 +02:00
msvensson@neptunus.(none)
125163c03b Init some variables that changes between test cases direclty in run_testcase 
This can not be done in run_testcase_start_servers as embedded never starts a server
Add error if mysqld_start is called in embedded mode
 2006-10-20 17:09:07 +02:00
jonas@perch.ndb.mysql.com
bcb92268e7 merge 2006-10-20 16:26:40 +02:00
jonas@perch.ndb.mysql.com
c2dcd9a9f0 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2006-10-20 16:25:14 +02:00
jonas@perch.ndb.mysql.com
822e638d57 Merge perch.ndb.mysql.com:/home/jonas/src/41-work 
into  perch.ndb.mysql.com:/home/jonas/src/50-work
 2006-10-20 16:22:16 +02:00
jonas@perch.ndb.mysql.com
a03b282f17 ndb - bug#23499 and bug#23502 
Fix some too small buffers in backup
 2006-10-20 16:16:01 +02:00
jonas@perch.ndb.mysql.com
ff05ba5131 ndb - bug#23494 
Fix bug in restore with table with many columns, Compute size of databuffer pool correctly
 2006-10-20 14:37:34 +02:00
jonas@perch.ndb.mysql.com
07c6a601ea ndb - 
Add better error message if getting error in RESTORE
 2006-10-20 14:36:39 +02:00
jonas@perch.ndb.mysql.com
11b4ac4733 ndb - bug#22838 
when doing create unique index which mysql will silently converts to PK, ndb is not informed
    so table will be useless.
  
    change so that we never do online add index wo/ primary key.
    this is not good, but it's better than a useless table
 2006-10-20 14:35:59 +02:00
jonas@perch.ndb.mysql.com
6980a0090f merge 2006-10-20 14:35:22 +02:00
jonas@perch.ndb.mysql.com
4218eb0fde Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2006-10-20 14:31:39 +02:00
dlenev@mockturtle.local
384f0fee0d Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  mockturtle.local:/home/dlenev/src/mysql-5.0-bg15228-2
 2006-10-20 16:05:23 +04:00
dlenev@mockturtle.local
850688194b Merge mockturtle.local:/home/dlenev/src/mysql-5.0-bg15228-2 
into  mockturtle.local:/home/dlenev/src/mysql-5.1-bg15228
 2006-10-20 15:54:58 +04:00
dlenev@mockturtle.local
3fce634fc1 Fix for bug#15228 "'invalid access to non-static data member' 
warnings in sql_trigger.cc and sql_view.cc".

According to the current version of C++ standard offsetof() macro
can't be used for non-POD types. So warnings were emitted when we
tried to use this macro for TABLE_LIST and Table_triggers_list
classes. Note that despite of these warnings it was probably safe
thing to do.

This fix tries to circumvent this limitation by implementing
custom version of offsetof() macro to be used with these
classes. This hack should go away once we will refactor
File_parser class.

Alternative approaches such as disabling this warning for
sql_trigger.cc/sql_view.cc or for the whole server were
considered less explicit. Also I was unable to find a way
to disable particular warning for particular _part_ of
file in GCC.
 2006-10-20 15:47:52 +04:00
jonas@perch.ndb.mysql.com
ab4ec626e2 Merge perch.ndb.mysql.com:/home/jonas/src/41-work 
into  perch.ndb.mysql.com:/home/jonas/src/50-work
 2006-10-20 13:38:49 +02:00
jonas@perch.ndb.mysql.com
303d7f6bed ndb - 
Fixed a 4.1/5.0 vs. 5.1 name change in latest SR bug fix
 2006-10-20 13:38:15 +02:00
kaa@polly.local
8800905fca Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  polly.local:/home/kaa/src/maint/m41-maint--07OGk
 2006-10-20 14:49:35 +04:00
kaa@polly.local
fdbb0d2a00 Merge polly.local:/tmp/maint/bug23256/mysql-5.0-maint 
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
 2006-10-20 14:45:34 +04:00
kaa@polly.local
c06f64e814 Merge polly.local:/tmp/maint/bug23256/mysql-4.1-maint 
into  polly.local:/home/kaa/src/maint/m41-maint--07OGk
 2006-10-20 14:44:22 +04:00
kaa@polly.local
6a67965869 Merge polly.local:/tmp/maint/bug23256/mysql-5.0-maint 
into  polly.local:/tmp/maint/bug23256/mysql-5.1-maint
 2006-10-20 14:34:13 +04:00
kaa@polly.local
165e2f156c Merge polly.local:/tmp/maint/bug23256/mysql-4.1-maint 
into  polly.local:/tmp/maint/bug23256/mysql-5.0-maint
 2006-10-20 14:32:31 +04:00
jonas@perch.ndb.mysql.com
a93a4c7bdb Merge perch.ndb.mysql.com:/home/jonas/src/41-work 
into  perch.ndb.mysql.com:/home/jonas/src/50-work
 2006-10-20 12:31:51 +02:00
kaa@polly.local
4d93069773 Fix for bug #23256 "doesn't build on alpha" 
- compilation on the Alpha platform was broken because the Alpha-specific code was not updated after replacing the SIGRETURN_FRAME_COUNT constant with a variable
 2006-10-20 14:31:47 +04:00
jonas@perch.ndb.mysql.com
88385d162a ndb - 
Fix monster SR bug making SR with ordered indexes (or temporary tables) broken
 2006-10-20 12:29:16 +02:00
ramil/ram@mysql.com/myoffice.izhnet.ru
0bbae9b3c5 Fix for bug #22723: Host field blank when server started with skip-grant 
We set 'host_or_ip' to "" in the Security_context::skip_grants().
 2006-10-20 15:08:25 +05:00
gkodinov@dl145s.mysql.com
99b572b9eb Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
 2006-10-20 11:15:54 +02:00
gkodinov@dl145s.mysql.com
bb0422a0b0 Merge bk-internal:/home/bk/mysql-5.1 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
 2006-10-20 11:12:35 +02:00
gkodinov@dl145s.mysql.com
4eff5ab26a Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
 2006-10-20 11:05:06 +02:00
gkodinov@dl145s.mysql.com
a93cc1b70b Merge bk-internal:/home/bk/mysql-5.0 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
 2006-10-20 11:02:56 +02:00
gkodinov@dl145s.mysql.com
0612a212d1 Merge bk-internal:/home/bk/mysql-4.1 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt
 2006-10-20 10:57:38 +02:00
gkodinov@dl145s.mysql.com
a0c0bbd8ae sql_rename.cc, sql_table.cc, type_decimal.result, mix2_myisam.result: 
merge fixes
 2006-10-20 10:12:38 +02:00
msvensson@neptunus.(none)
956c030231 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-10-19 23:27:22 +02:00
msvensson@neptunus.(none)
3426b59dbb Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-19 23:26:43 +02:00
msvensson@neptunus.(none)
309db59807 Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-10-19 23:25:12 +02:00
msvensson@neptunus.(none)
13b9adbac3 Merge bk-internal:/home/bk/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-10-19 23:13:32 +02:00
malff/marcsql@weblab.(none)
ea0998caca Bug#20028 (Function with select return no data) 
This patch reverts a change introduced by Bug 6951, which incorrectly
set thd->abort_on_warning for stored procedures.

As per internal discussions about the SQL_MODE=TRADITIONAL,
the correct behavior is to *not* abort on warnings even inside an INSERT/UPDATE
trigger.

Tests for Stored Procedures, Stored Functions, Triggers involving SQL_MODE
have been included or revised, to reflect the intended behavior.

(reposting approved patch, to work around source control issues, no review needed)
 2006-10-19 11:39:51 -07:00
msvensson@neptunus.(none)
698e0abd11 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-19 20:34:28 +02:00
msvensson@neptunus.(none)
c4a570aa00 Adapt to running from "binary dist" 
Add function mtr_exe_maybe_exists to look for binaries that is optional
Skip ndb support if it's a binary dist where mysqld supports ndb but there is no ndbd
 2006-10-19 20:33:32 +02:00
msvensson@neptunus.(none)
c950eee217 Fix problem running rpl_timezone on powermacg5, it was not popular to set TZ to "" so now it's set 
to a value wich is not our default
 2006-10-19 20:29:33 +02:00
msvensson@neptunus.(none)
81cf15ae27 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-10-19 17:39:12 +02:00
svoj@mysql.com/april.(none)
26bf6a25c8 After merge fix. 2006-10-19 20:29:12 +05:00
msvensson@neptunus.(none)
c7710510ac Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-19 17:15:49 +02:00
svoj@april.(none)
8b01686765 Merge mysql.com:/home/svoj/devel/mysql/engines/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/engines/mysql-5.1-engines
 2006-10-19 19:59:57 +05:00
gkodinov@dl145s.mysql.com
aaed398254 Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
 2006-10-19 16:43:46 +02:00
gkodinov@dl145s.mysql.com
ea8ba03556 Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-5.1 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
 2006-10-19 16:00:06 +02:00
andrey@example.com
bef920e08e Fix small glitch during parsing of ALTER EVENT xyz 
with only COMMENT clause. Strangely it has manifestated itself
only on two platforms. This is a fix for bug#23423 
"Syntax error for "ALTER EVENT ... COMMENT ..." on just two platforms"
 2006-10-19 15:56:37 +02:00
svoj@mysql.com/april.(none)
afefa5d42f After merge fix. 2006-10-19 18:48:37 +05:00
mskold/marty@linux.site
22ed305062 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2006-10-19 15:32:21 +02:00
mskold/marty@linux.site
dfa91a4043 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2006-10-19 15:29:52 +02:00