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

14733 commits

Author SHA1 Message Date
msvensson@neptunus.(none)
3ece1f3eda Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-02-23 10:54:56 +01:00
msvensson@neptunus.(none)
71ef9102c1 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-23 10:45:39 +01:00
msvensson@neptunus.(none)
8d78cd3e3c Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-02-23 10:41:37 +01:00
konstantin@mysql.com
0621428d79 Fix a bad merge of mine. 2006-02-23 12:32:54 +03:00
reggie@linux.site
3de74e6237 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  linux.site:/home/reggie/work/mysql-5.1
 2006-02-22 14:18:45 -06:00
reggie@linux.site
6cea16a825 BUG# 17393: Partitions: Wrong error message when assigning too many subpartitions 
We changed the error message to more clearly reflect the fact
that we are counting parts and subparts
 2006-02-22 14:17:11 -06:00
konstantin@mysql.com
5d07195888 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
 2006-02-22 20:15:24 +03:00
konstantin@mysql.com
97d36a453e Post-merge fixes. 2006-02-22 20:03:25 +03:00
aelkin@mysql.com
35861f3006 Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/5.0 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/5.0-bug17265
 2006-02-22 18:53:34 +02:00
aelkin@mysql.com
4155d1405e BUG#17265 Assertion failure in rpl_row_view01. 
To quote Timour review lines:

The actual cause of the bug is that sql_base.cc:setup_wild()
sets "select_lex->with_wild = 0" (in the end of the function) once
it expands all wild-cards, and wild-card expansion is done during
the prepare phase. During this phase we replace all "*" with the
corresponding items, which for views happen to be references to
references. When we do execute, select_lex->with_wild = 0, and
all "*" are already replaced by the corresponding items, which
in the case of views need to be dereferenced first.

Fixed by refining the assert. Regression test for the bug is rpl_row_view01,
as was reported.
 2006-02-22 17:07:18 +02:00
mskold@mysql.com
bdf3e238b8 Removed unnecessary unlock/lock of mutex 2006-02-22 16:05:57 +01:00
mskold@mysql.com
865a3c9204 Fixes for push version of discover of on-line altered table 2006-02-22 15:19:22 +01:00
konstantin@mysql.com
a27e32b565 Merge mysql.com:/home/kostja/mysql/mysql-5.0-root 
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
 2006-02-22 14:04:24 +03:00
anozdrin@mysql.com
a77cc69e62 Fix for BUG#7787: Stored procedures: improper warning for "grant execute" statement. 
The problem was that error flag was not reset.
 2006-02-22 13:44:04 +03:00
mskold@mysql.com
f56016ee66 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
 2006-02-22 09:10:55 +01:00
msvensson@neptunus.(none)
3f39d25e93 Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-02-22 08:55:19 +01:00
reggie@linux.site
cb10b77c31 BUG #15408 - Partitions: subpartition names are not unique 2006-02-21 17:40:07 -06:00
konstantin@mysql.com
f0abdf1ebe Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/opt/local/work/mysql-5.0-runtime
 2006-02-22 01:20:47 +03:00
reggie@linux.site
336c0ba4cb Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  linux.site:/home/reggie/work/mysql-5.1-bug15408
 2006-02-21 10:29:41 -06:00
msvensson@neptunus.(none)
6efee6c42c Merge neptunus.(none):/home/msvensson/mysql/bug16878/my51-bug16878 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-02-21 17:25:21 +01:00
msvensson@neptunus.(none)
334b9c7a27 Merge neptunus.(none):/home/msvensson/mysql/bug16878/my50-bug16878 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-21 17:19:46 +01:00
msvensson@neptunus.(none)
d722c5c60d Merge neptunus.(none):/home/msvensson/mysql/bug16878/my50-bug16878 
into  neptunus.(none):/home/msvensson/mysql/bug16878/my51-bug16878
 2006-02-21 17:15:37 +01:00
mskold@mysql.com
043a16e34a Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-ndb_improved_on-line_discover 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
 2006-02-21 13:54:58 +01:00
msvensson@neptunus.(none)
8d6ffa86e5 Merge neptunus.(none):/home/msvensson/mysql/bug2845/my51-bug2845 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-02-21 08:45:17 +01:00
msvensson@neptunus.(none)
674ee5987c Merge neptunus.(none):/home/msvensson/mysql/bug2845/my50-bug2845 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-21 08:44:27 +01:00
andrey@lmy004.
0ba2425caf fix for bug#16407 (EVENTS: sql_mode) 
post-review fixes
 2006-02-21 02:40:23 +01:00
andrey@lmy004.
a1fdeb1386 manual merge 2006-02-21 00:01:39 +01:00
andrey@lmy004.
22ba4ca3a3 fix for bug#16407 (Events: Changes in sql_mode won't be taken into account) 
WL#1032
sql_mode setting was disregarded during create/alter event and wasn't set during
event execution.
(post-review small fixes)
 2006-02-20 23:52:22 +01:00
andrey@lmy004.
7ef557ed49 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-bug16406
 2006-02-20 23:29:55 +01:00
mskold@mysql.com
df4a632339 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
 2006-02-20 22:23:02 +01:00
sergefp@mysql.com
17a212203b Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/home/psergey/mysql-5.1-look
 2006-02-21 00:20:44 +03:00
sergefp@mysql.com
e76e791d9b BUG#15448 (group_min_max test failure): Don't bypass group-min-max optimizer entry point 
if we've got a tree of type ALWAYS or MAYBE.
 2006-02-21 00:17:29 +03:00
konstantin@mysql.com
07db5ac8b1 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/kostja/mysql/mysql-5.1-vanilla
 2006-02-20 23:00:50 +03:00
andrey@lmy004.
e5e7066e26 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-bug16406
 2006-02-20 20:57:44 +01:00
konstantin@mysql.com
b58345d8c4 A new error message for deprecated statements. 
Fixes failing sp.test
 2006-02-20 22:51:32 +03:00
pekka@mysql.com
976be6facc ndb - rbr blobs etc: minor changes bug#17045 bug#17505 2006-02-20 16:36:30 +01:00
pekka@mysql.com
78d3257f37 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/space/pekka/ndb/version/my51
 2006-02-20 12:37:27 +01:00
tomas@poseidon.ndb.mysql.com
bb0b5cdbb1 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-02-20 12:37:26 +01:00
tomas@poseidon.ndb.mysql.com
82be07c41b Bug #17559 ndb_gis test failure 
- test tables use blobs without PK, and was not handled correctly
 2006-02-20 12:36:10 +01:00
pekka@mysql.com
32298c75c0 ndb - rbr blobs etc: set db/schema in injector_ndb before calling NDB 2006-02-20 12:07:12 +01:00
igor@rurik.mysql.com
1e437a1fda Merge rurik.mysql.com:/home/igor/mysql-5.1 
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
 2006-02-19 19:26:25 -08:00
igor@rurik.mysql.com
a3093f7e1e Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-02-19 17:26:06 -08:00
brian@zim.tangent.org
86763e6198 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.tangent.org:/home/brian/mysql/dep-5.1
 2006-02-19 09:48:17 -08:00
brian@zim.tangent.org
faa1b42989 Fixed some threading issues that Guilhem found (and its what I get for copy and pasting from elsewhere without thinking about it). Added depracted messages to BACKUP, RESTORE, and LOAD TABLE FROM MASTER (which doesn't work well). 2006-02-19 09:41:59 -08:00
pekka@mysql.com
5756c30c02 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/space/pekka/ndb/version/my51
 2006-02-19 05:08:23 +01:00
guilhem@mysql.com
af149459ed Fix after merge of 5.0, fix of a result file which somebody hadn't updated. 
"mysqldump" test fails (mysqlimport related, Brian aware), ndb_cache2 ndb_cache_multi2
partition_mgm_err fail (unrelated to my changes), rpl_row_view01 (known crash BUG#17265)
 2006-02-18 23:37:56 +01:00
guilhem@mysql.com
473cfdfcb2 Merge mysql.com:/home/mysql_src/mysql-5.0 
into  mysql.com:/home/mysql_src/mysql-5.1-new; will fix manually sp_head.cc and mysqld.cc later soon.
 2006-02-18 19:07:32 +01:00
guilhem@mysql.com
37c1744a03 Fix for BUG#13897 "failure to do SET SQL_MODE=N where N is a number > 31" (the original bug's title isn't the simplest 
symptom). sys_var::check_set() was wrong. mysqlbinlog makes use of such SET SQL_MODE=N
(where N is interpreted like if SQL_MODE was a field of type SET), so
this bug affected recovery from binlogs if the server was running with certain SQL_MODE values,
for example the default values on Windows (STRICT_TRANS_TABLES); to work around this bug people
had to edit mysqlbinlog's output.
 2006-02-18 17:32:15 +01:00
guilhem@mysql.com
56bed24c92 Fix for BUG#14769 "Function fails to replicate if fails half-way (slave stops)": 
if the function, invoked in a non-binlogged caller (e.g. SELECT, DO), failed half-way on the master,
slave would stop and complain that error code between him and master mismatch. 
To solve this, when a stored function is invoked in a non-binlogged caller (e.g. SELECT, DO), we binlog the function
call as SELECT instead of as DO (see revision comment of sp_head.cc for more).
And: minor wording change in the help text.
This cset will cause conflicts in 5.1, I'll merge.
 2006-02-18 17:26:30 +01:00
guilhem@mysql.com
4c5d18b150 Fix for BUG#16559 "Replication Problems with Non transactional tables inside an interrupted trans.": 
problem was: when a connection disconnects having an open transaction affecting MyISAM and InnoDB, the ROLLBACK event stored in the binary log
contained a non-zero error code (1053 because of the disconnection), so when slave applied the transaction, slave complained that its ROLLBACK succeeded
(error_code=0) while master's had 1053, so slave stopped. But internally generated binlog events such as this ROLLBACK
should always have 0 as error code, as is true in 4.1 and was accidentally broken in 5.0,
so that there is no false alarm.
 2006-02-18 17:19:16 +01:00