mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 05:52:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
31372 commits 2784 branches 343 tags 1.6 GiB
Commit graph

14876 commits

Author SHA1 Message Date
monty@mysql.com
ab78d065ec Merge monty@192.168.0.9:/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2006-02-25 17:48:09 +02:00
monty@mysql.com
54274976e7 Fixed compiler warnings from gcc 4.0.2: 
- Added empty constructors and virtual destructors to many classes and structs
- Removed some usage of the offsetof() macro to instead use C++ class pointers
 2006-02-25 17:46:30 +02:00
monty@mysql.com
a7df038d16 Add back free that I accidently removed in last patch 2006-02-25 13:58:00 +02:00
monty@mysql.com
eff69e73a3 Fixed typo 2006-02-25 13:49:43 +02:00
monty@mysql.com
6fd52639c0 Merge monty@192.168.0.9:/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2006-02-25 13:26:05 +02:00
monty@mysql.com
dd1d40f8f8 Fixed new introduced bug in binlog.test with --ps-protocol 2006-02-25 13:24:18 +02:00
brian@zim.(none)
f40705eb9b Merge zim.(none):/home/brian/mysql/mysql-5.0 
into  zim.(none):/home/brian/mysql/dep-5.1
 2006-02-24 23:31:57 -08:00
sergefp@mysql.com
8bb9343688 Fix a typo in dbug printout 2006-02-25 00:41:37 +03:00
dlenev@mysql.com
0c15039e74 Fix for bug #13525 "Rename table does not keep info of triggers". 
Let us transfer triggers associated with table when we rename it (but only if
we are not changing database to which table belongs, in the latter case we will
emit error).
 2006-02-24 23:50:36 +03:00
mats@mysql.com
c33a64a0e3 Merge mysqldev@production.mysql.com:my/mysql-5.1-release 
into  mysql.com:/home/bk/mysql-5.1-release-bug13418-lars
 2006-02-24 20:27:51 +01:00
monty@mysql.com
aa4128f811 Merge monty@192.168.0.9:/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2006-02-24 18:36:09 +02:00
monty@mysql.com
82b77cdd90 Fixes to embedded server to be able to run tests with it 
(Needed for "list of pushes" web page and autopush)
 2006-02-24 18:34:15 +02:00
reggie@linux.site
52fbc7a1cd BUG# 17430 Partitoins: crash on SELECT * FROM t1 WHERE f_int1 IS NULL 
BUG# 17432: Partitions: wrong result, SELECT ... WHERE <column> is null
 2006-02-24 10:10:41 -06:00
lars@mysql.com
b4953f12a2 Merge mysqldev@production.mysql.com:my/mysql-5.1-release 
into  mysql.com:/users/lthalmann/bk/mysql-5.1-release-bug13418
 2006-02-24 16:22:06 +01:00
lars@mysql.com
32a8a469a7 BUG#13418 (V2): Bit columns should replicate correctly when using RBR 2006-02-24 15:38:20 +01:00
andrey@lmy004.
b6f338e9e5 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-bug16411
 2006-02-24 14:14:51 +01:00
andrey@lmy004.
11e5e40ede fix for bug #16411 (microseconds are allowed) 
last fixes
 2006-02-24 14:08:34 +01:00
andrey@lmy004.
734bfe4759 fix for bug #16411 (Microseconds are allowed for events) 2006-02-24 14:02:26 +01:00
evgen@moonbone.local
bcff10f1fb Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/17530-bug-5.0-mysql
 2006-02-24 14:29:41 +03:00
andrey@lmy004.
c4602da973 merge 2006-02-24 12:03:32 +01:00
andrey@lmy004.
a594cd080c Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-bug16412
 2006-02-24 11:56:16 +01:00
andrey@lmy004.
c04b3f4a91 Fix output per bug #16412 (Events: SHOW PRIVILEGES gives incorrect information) 
WL#1034 (Internal CRON)
 2006-02-24 11:52:03 +01:00
elliot@mysql.com
7e3f3f74cd Merge mysqldev@production.mysql.com:my/mysql-5.1-release 
into  mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-release
 2006-02-23 23:21:53 -05:00
elliot@mysql.com
5753dfe73d BUG#17521 alter database crashes slave 
Problem was a null pointer
Fixed by passing correct database name to slave filtering mechanism
Added test.
 2006-02-23 23:20:29 -05:00
andrey@lmy004.
68a0112047 Merge mysqldev@production.mysql.com:my/mysql-5.1-release 
into lmy004.:/work/mysql-5.1-release
 2006-02-24 00:33:26 +01:00
andrey@lmy004.
5ac46bb961 fix for bug #16400 2006-02-24 00:29:50 +01:00
mats@mysql.com
adc9723611 Merge mysqldev@production.mysql.com:my/mysql-5.1-release 
into  mysql.com:/home/bk/fix-mysql-5.1-release
 2006-02-23 22:21:07 +01:00
mats@mysql.com
0cc0884200 Bug#17678 (RBR format change: moving from VLE to net encoding): 
Switching to use net_*_length() instead of VLE functions.
 2006-02-23 22:19:47 +01:00
konstantin@mysql.com
49ad134e9f After-merge fixes (Bug#13134) 2006-02-24 00:12:04 +03:00
konstantin@mysql.com
90edf3720a Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/opt/local/work/mysql-5.0-runtime
 2006-02-24 00:09:47 +03:00
konstantin@mysql.com
af62c4a959 Merge mysql.com:/opt/local/work/mysql-4.1-13134 
into  mysql.com:/opt/local/work/mysql-5.0-runtime
 2006-02-24 00:00:15 +03:00
paul@snake-hub.snake.net
85869e5fde Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
 2006-02-23 11:08:16 -06:00
paul@snake-hub.snake.net
f47ed62fb0 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
 2006-02-23 11:07:56 -06:00
paul@snake-hub.snake.net
4ca8a492e2 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
 2006-02-23 09:41:04 -06:00
paul@snake-hub.snake.net
b2529c2ab2 mysqld.cc: 
Fix out of order entries in option struct.
 2006-02-23 09:11:05 -06:00
konstantin@mysql.com
630869bc56 Cleanup. 2006-02-23 16:21:43 +03:00
mats@mysql.com
584388c74c Merge mysqldev@production.mysql.com:my/mysql-5.1-release 
into  mysql.com:/users/mkindahl/bk/merge-b17181-mysql-5.1-new
 2006-02-23 13:49:27 +01:00
mats@mysql.com
5dab541c3a Bug#17181 (mysqlslap test server crash): 
Moving assignments to table_map_id for thread-safe handling of
  table shares.
 2006-02-23 13:34:03 +01:00
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
konstantin@mysql.com
442c2ba8af A fix and a test case for Bug#13134 "Length of VARCHAR() utf8 
column is increasing when table is recreated with PS/SP":
make use of create_field::char_length more consistent in the code.
Reinit create_field::length from create_field::char_length
for every execution of a prepared statement (actually fixes the 
bug).
 2006-02-21 19:52:20 +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
evgen@moonbone.local
e6924206cd Fixed bug#17530: Incorrect key truncation on table creation caused server crash. 
When a too long field is used for a key, only a prefix part of the field is 
used. Length is reduced to the max key length allowed for storage. But if the
field have a multibyte charset it is possible to break multibyte char
sequence. This leads to the failed assertion in the innodb code and 
server crash when a record is inserted.

The make_prepare_table() now aligns truncated key length to the boundary of
multibyte char.
 2006-02-21 18:09:32 +03: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
andrey@lmy004.
2996d95257 fix for bug #16411 Events: Microsecond intervals are allowed 
WL#1034
 2006-02-20 16:06:05 +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
pekka@mysql.com
69d7e4f0ae Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/space/pekka/ndb/version/my51
 2006-02-18 05:17:10 +01:00
brian@zim.tangent.org
e4ce125d79 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.tangent.org:/home/brian/mysql/dep-5.1
 2006-02-17 16:06:08 -08:00
brian@zim.tangent.org
3ea4f67f5b Removing support for storage engines being loadable, will push featureto 5.2. 2006-02-17 16:00:36 -08:00
pekka@mysql.com
7827a89814 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/space/pekka/ndb/version/my51
 2006-02-17 22:35:53 +01:00
pekka@mysql.com
6cfe04630b ndb - rbr blobs: fixes (not final) 2006-02-17 22:33:31 +01:00
jimw@mysql.com
cdad081fbe Merge mysql.com:/home/jimw/my/mysql-5.1-13883 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-02-17 11:06:05 -08:00
jimw@mysql.com
bf0b775859 Merge mysql.com:/home/jimw/my/mysql-5.0-7955 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-02-17 11:03:34 -08:00
jimw@mysql.com
30c343a04e Merge mysql.com:/home/jimw/my/mysql-5.0-clean 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-02-17 10:59:47 -08:00
jimw@mysql.com
10b96ec4c8 Merge mysql.com:/home/jimw/my/mysql-5.1-17169 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-02-17 10:55:43 -08:00
jimw@mysql.com
38aafce1ef Merge mysql.com:/home/jimw/my/mysql-5.0-14676 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2006-02-17 08:32:50 -08:00
tomas@poseidon.ndb.mysql.com
9495f8c56a Bug #17210 Create temp table call to ha_ndbcluster::create_handler_files caused core 
- do not try to create ndb temp tables even if default storage is ndb
 2006-02-17 17:12:35 +01:00
bar@mysql.com
9d9dcf81b8 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new.16234
 2006-02-17 16:39:42 +04:00
evgen@moonbone.local
e115d605de Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/15706-bug-5.0-mysql
 2006-02-17 15:36:56 +03:00
pekka@mysql.com
5007310de2 ndb - rbr blobs: remove obsolete problem-causing temporary fix 2006-02-17 11:53:39 +01:00
bar@mysql.com
5f7cca2e46 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new.16234
 2006-02-17 13:38:01 +04:00
holyfoot@deer.(none)
942503927a WL#2645 (CHECK FOR UPGRADE) 
5.1-related fixes
 2006-02-17 13:37:37 +04:00
mskold@mysql.com
406d52d4aa 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-17 10:20:16 +01:00
mskold@mysql.com
6d87be2c34 Invalidate table including all it's indexes from binlog thread 2006-02-17 09:44:12 +01:00
holyfoot@mysql.com
be02944df6 Merging 5.0->5.1 2006-02-17 11:26:03 +04:00
holyfoot@mysql.com
f500cbf83c Merge bk@192.168.21.1:mysql-5.0 
into mysql.com:/home/hf/work/mysql-5.0.w2645
 2006-02-17 10:56:54 +04:00
holyfoot@deer.(none)
053d90a234 WL#2645 (CHECK TABLE FOR UPGRADE) 
necessary implementation in the server
mysql_upgrade script added
 2006-02-17 10:52:32 +04:00
reggie@linux.site
1527e94fc8 BUG# 15408 Partitions: subpartition names are not unique 
THis patch goes along with 1.2098.23.1 to form the complete patch
 2006-02-16 15:02:44 -06:00
evgen@moonbone.local
611f25f932 Merge 2006-02-16 21:11:38 +03:00
reggie@big_geek.
bed38d0614 moved prune_partition_set decl from handler.h to sql_partition.h during merge 
cleaned up some files from the partition code move
 2006-02-16 12:01:14 -06:00
reggie@big_geek.
3ce0880d3f Merge reggie@192.168.0.9:/home/reggie/work/mysql-5.1-bug15408 
into  big_geek.:C:/Work/mysql/mysql-5.1-bug15408
 2006-02-16 11:07:21 -06:00
reggie@big_geek.
466a5bb399 BUG#15408: Partitions: subpartition names are not unique 
Also, moved some of the code out of handler.h and into partition specific files for better 
separation.
Also, moved some of the C funcs into partition_info as formal C++ methods
 2006-02-16 10:38:33 -06:00
pekka@mysql.com
9d2fffb8a5 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/space/pekka/ndb/version/my51
 2006-02-16 17:27:47 +01:00
tomas@poseidon.ndb.mysql.com
b52df67364 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-16 17:27:46 +01:00
tomas@poseidon.ndb.mysql.com
c810fd083a Bug #17459 Cluster row based replication not setup if backup is ongoing 
- also accept setting up binlog for tables in stateBackup
 2006-02-16 17:25:28 +01:00
jimw@mysql.com
d30dbf6efa Bug #17169: Partitions: out of memory if add partition and unique. 
When creating a new partition, a bogus memory allocation problem was
reported.
 2006-02-16 08:15:36 -08:00
andrey@lmy004.
4e4520b723 fix for bug#17543 Creating Event crash the server 
this problem affects only debug builds
 2006-02-16 16:11:02 +01:00
pekka@mysql.com
ad86b3e43a ndb - wl#3023 : pass tables per GCI to injector at epoch start 2006-02-16 14:54:30 +01:00
andrey@lmy004.
d89fc62e78 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-bug16406
 2006-02-16 14:53:36 +01:00
aivanov@mysql.com
09847849b9 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/alexi/dev/mysql-5.1-wl3148
 2006-02-16 16:53:34 +03:00
aivanov@mysql.com
14633e0532 The patch adds PROCESSLIST information schema 2006-02-16 16:45:05 +03:00
dlenev@mysql.com
e47606a30b Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  mysql.com:/home/dlenev/src/mysql-5.0-bg16593
 2006-02-16 16:22:53 +03:00
dlenev@mysql.com
4a41a00d4b Fix for bug #16593 "Deadlock or crash in stress test for case where 
trigger starts trigger".

In short, the deadlock/crash happened when execution of statement, which used
stored functions or activated triggers, coincided with alteration of the
tables used by these functions or triggers (in highly concurrent environment).

Bug was caused by the incorrect handling of tables from prelocked set in
open_tables() functions in situations when refresh happened. This fix replaces
old smart but not very robust way of handling tables after refresh (which was
closing only old tables), with new one which simply closes all tables opened so
far and restarts open_tables().
Also fixed handling of temporary tables in close_tables_for_reopen().

No test case present since bug manifests itself only in concurrent environment.
 2006-02-16 16:19:24 +03:00
andrey@lmy004.
3c82af94e7 fix bug in show events which shows 
| INTERVAL_VALUE | INTERVAL_FIELD |
| 20             | 20 MINUTE      |
the second one should be without the value
 2006-02-16 13:11:16 +01:00
msvensson@neptunus.(none)
0aa2580a42 Merge neptunus.(none):/home/msvensson/mysql/bug2845/my50-bug2845 
into  neptunus.(none):/home/msvensson/mysql/bug2845/my51-bug2845
 2006-02-16 12:10:40 +01:00
msvensson@neptunus.(none)
8c828967ee Bug#2845 client fails to reconnect if using TCP/IP 
- Detect that connection to server has been broken in "net_clear". Since 
  net_clear is always called before we send command to server, we can be sure
  that server has not received the command.
 2006-02-16 12:02:38 +01:00
mskold@mysql.com
ae586462b2 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb_improved_on-line_discover 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-ndb_improved_on-line_discover
 2006-02-16 10:15:44 +01:00
mskold@mysql.com
e62db4e18c Improvement of on-line discovery in injector thread 2006-02-16 10:07:31 +01:00
ingo@mysql.com
65a4e27633 Merge mysql.com:/home/mydev/mysql-5.0 
into  mysql.com:/home/mydev/mysql-5.0-bug8841
 2006-02-16 08:59:55 +01:00
ingo@mysql.com
233155e64e Merge mysql.com:/home/mydev/mysql-5.1 
into  mysql.com:/home/mydev/mysql-5.1-bug8841
 2006-02-16 07:01:15 +01:00
andrey@lmy004.
6354f2454d Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-bug16406
 2006-02-16 05:23:04 +01:00
andrey@lmy004.
7b2650a256 small post-merge fixes for bug#16406 
(pre-push)
 2006-02-16 05:21:02 +01:00
tomas@poseidon.ndb.mysql.com
704562f696 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-16 03:24:55 +01:00
tomas@poseidon.ndb.mysql.com
212d8c05e6 Bug #17415 special character tables are not handled correctly in ndb binlog/schema dist 2006-02-16 03:23:43 +01:00
andrey@lmy004.
95e87f0811 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-bug16406
 2006-02-16 02:13:37 +01:00
andrey@lmy004.
2158add8f0 merge 2006-02-16 01:27:36 +01:00
andrey@lmy004.
d3e0875759 fix for bug#16406 (Events: DROP DATABASE doesn't automatically drop events) 
WL#1034
- This changeset also changes the executor so its quite more stable now.
  Stressing test case added that executes ~800 events per second and dropping
  hundreds of events at once using DROP DATABASE.
(with fixes after review of JimW)
(with fixes after review of Serg)
 2006-02-16 00:43:11 +01:00
tomas@poseidon.ndb.mysql.com
cd8f8449e2 Bug #17414 ndb schema distribution functionality does not work on mysql servers without binlog 2006-02-16 00:30:56 +01:00
jimw@mysql.com
5e6b6c9935 Merge bk-internal:/home/bk/mysql-5.1-new 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-02-15 15:08:20 -08:00
andrey@lmy004.
00b188cc52 build fixes 2006-02-15 23:43:11 +01:00
andrey@lmy004.
a613782f96 more cosmetic before push of fix for bug#17289 2006-02-15 22:32:25 +01:00
jimw@mysql.com
95b45389cd Merge bk-internal:/home/bk/mysql-5.1-new 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-02-15 13:11:51 -08:00
ingo@mysql.com
e116d697bd Merge mysql.com:/home/mydev/mysql-5.1 
into  mysql.com:/home/mydev/mysql-5.1-bug8841
 2006-02-15 21:54:01 +01:00
andrey@lmy004.
189baa169b merging before test + push 2006-02-15 21:51:57 +01:00
andrey@lmy004.
8193669f0a cosmetic post-review changes 2006-02-15 21:40:38 +01:00