mats@mysql.com
75834b6e01
Merge mysql.com:/home/bkroot/mysql-5.0
...
into mysql.com:/home/bk/b18293-mysql-5.1-new
2006-03-21 20:17:28 +01:00
mats@mysql.com
7351d35693
Merge mysql.com:/home/bkroot/mysql-5.0
...
into mysql.com:/home/bk/b18293-mysql-5.0
2006-03-21 14:37:41 +01:00
mats@mysql.com
1d4ee057ee
BUG#18293 (Values in stored procedures written to binlog unescaped):
...
Generating character set-independent quoting of strings for the
binary log when executing statements from inside stored procedure.
2006-03-21 14:35:49 +01:00
gluh@mysql.com
c9d4d6aa29
5.0 -> 5.1 merge
2006-03-21 16:26:47 +04:00
tomas@poseidon.ndb.mysql.com
bdc3f48545
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-03-21 12:34:45 +01:00
tomas@poseidon.ndb.mysql.com
c9c0a6d690
disabled undeterministic test
2006-03-21 12:33:13 +01:00
pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se
7432108f46
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug17754
2006-03-21 00:00:19 -05:00
pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se
86086e7193
Manual merge
2006-03-20 23:55:10 -05:00
pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se
4d2b8f8ef6
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug17754
2006-03-20 22:47:48 -05:00
pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se
f9075c0732
BUG#17754
...
Fixed result files
2006-03-20 21:46:16 -05:00
knielsen@mysql.com
3e7d8a78db
Fix compilation failure when compiling without partitioning, introduced
...
by previous push.
2006-03-20 21:57:23 +01:00
pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se
738176c15f
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug17754
2006-03-20 14:41:50 -05:00
pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se
bd77396a94
BUG#17754
...
Added new syntax ALTER TABLE t1 REMOVE PARTITIONING,
changed semantics of ALTER TABLE t1 ENGINE=X; to not remove partitioning
Fix a number of mix engine bugs in partitioning
2006-03-20 14:36:21 -05:00
holyfoot@vva.(none)
28834f4466
merging
2006-03-20 19:37:44 +04:00
holyfoot@mysql.com
fc94004a65
merging
2006-03-20 19:22:56 +04:00
tomas@poseidon.ndb.mysql.com
2c991eec59
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-03-20 16:05:09 +01:00
tomas@poseidon.ndb.mysql.com
9da0e8f5b4
ndb: added debug printout
2006-03-20 16:03:35 +01:00
gluh@eagle.intranet.mysql.r18.ru
820731c6ed
Fix for bug#15336 Partitions: crash if create table as select
...
added HA_EXTRA_WRITE_CACHE case to ha_partition::extra()
2006-03-20 18:58:21 +04:00
holyfoot@vva.(none)
936d596abc
Code #ifdef-ed
2006-03-20 18:46:13 +04:00
gluh@eagle.intranet.mysql.r18.ru
c0420a5c5e
Bug#14367 Partitions: crash if utf8 column
...
use part_info->item_free_list instead of thd->free_list during partition function parsing
2006-03-20 17:41:45 +04:00
holyfoot@vva.(none)
a68742f460
bug #17290 (sp with delete, create and rollback causes MySQLD core)
...
additional fixes
2006-03-20 17:30:01 +04:00
holyfoot@mysql.com
87a4e300a1
Merge bk@192.168.21.1:mysql-5.1-new
...
into mysql.com:/home/hf/work/mysql-5.1.clean
2006-03-20 15:24:14 +04:00
gluh@eagle.intranet.mysql.r18.ru
f78ae59f0f
Fix for bug#18224 VIEW on information_schema crashes the server
...
additional check for subselect
2006-03-20 14:17:47 +04:00
gluh@eagle.intranet.mysql.r18.ru
a184a00eae
Fix for bug #18113 "SELECT * FROM information_schema.xxx crashes server"
...
Crash happened when one selected data from one of INFORMATION_SCHEMA
tables and in order to build its contents server had to open view which
used stored function and table or view on which one had not global or
database-level privileges (e.g. had only table-level or had no
privileges at all).
The crash was caused by usage of check_grant() function, which assumes
that either number of tables to be inspected by it is limited explicitly
or table list used and thd->lex->query_tables_own_last value correspond
to each other (the latter should be either 0 or point to next_global
member of one of elements of this table list), in conditions when
above assumptions were not true. This fix just explicitly limits
number of tables to be inspected. Other negative effects which are
caused by the fact that thd->lex->query_tables_own_last might not
be set properly during processing of I_S tables are less disastrous
and will be reported and fixed separetely.
2006-03-20 13:42:02 +04:00
knielsen@mysql.com
95242e7186
Fix HPUX compilation.
2006-03-20 09:35:56 +01:00
hartmut@mysql.com
3b34159891
Merge mysql.com:/home/hartmut/projects/mysql/bk-clean/5.1
...
into mysql.com:/home/hartmut/projects/mysql/dev/5.1/gcc41
2006-03-18 18:21:48 +01:00
hartmut@mysql.com
7f0430e134
gcc 4.1.0 compile fix (Bug #18332 )
2006-03-18 18:12:47 +01:00
mats@mysql.com
721ca0cccf
Merge mysql.com:/home/bkroot/mysql-5.1-new
...
into mysql.com:/home/bk/b17400-mysql-5.1-new
2006-03-18 17:18:52 +01:00
mats@mysql.com
723d5deb01
Bug#18326 (Do not lock tables for writing during prepare of statement):
...
Fixing tests to get the test suite passing. This does not hide the bug
since it's a matter of performance, not correctness.
2006-03-18 17:15:53 +01:00
holyfoot@mysql.com
d1909208a3
Merge bk@192.168.21.1:mysql-5.1-new
...
into mysql.com:/home/hf/work/mysql-5.1.clean
2006-03-18 18:51:17 +04:00
holyfoot@vva.(none)
8074262eda
bug 17290 and bug 14350
...
added THD::work_part_info member where we now store modified
partition_info structure.
It allows no solve problem when different parts of the part_info get
into different mem_roots
2006-03-18 18:48:21 +04:00
kent@mysql.com
36da096324
Merge
2006-03-18 10:11:36 +01:00
mskold@mysql.com
8296653a91
Post-review fixes for bug#17899 Partitions: crash, NDB, Select .. ORDER BY
2006-03-18 10:04:39 +01:00
mskold@mysql.com
83d4481a5d
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-03-18 08:31:28 +01:00
mats@mysql.com
a8a2d16c1d
Merge mysql.com:/home/bkroot/mysql-5.1-new
...
into mysql.com:/home/bk/b17400-mysql-5.1-new
2006-03-18 00:36:12 +01:00
cmiller@calliope.local
eebe4fb84d
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into calliope.local:/Volumes/Source/src/mysql-5.0__bug15846
2006-03-17 18:48:27 +01:00
cmiller@calliope.local
34638c283a
No longer leak file descriptors in mysql_close. Fixes Bug#15846.
2006-03-17 18:46:34 +01:00
mats@mysql.com
da22f2dd44
Merge mysql.com:/home/bkroot/mysql-5.1-new
...
into mysql.com:/home/bk/b17400-mysql-5.1-new
2006-03-17 18:19:10 +01:00
mats@mysql.com
4440b71dda
Bug#18280 (RBR: Extreneous maps when writing to general_log and slow_log):
...
Filter out replication general_log and slow_log entirely from binary
log. Caching result of table share-specific tests.
2006-03-17 18:11:07 +01:00
mskold@mysql.com
9e9d2e0311
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-03-17 17:25:00 +01:00
jani@ibmlab.site
928591e50f
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into ibmlab.site:/home/my/bk/mysql-5.1-new
2006-03-17 15:56:27 +02:00
rburnett@production.mysql.com
e16e4a7cc9
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into production.mysql.com:/usersnfs/rburnett/mysql-5.1
2006-03-17 14:56:25 +01:00
kent@mysql.com
7e48f7b34b
configure.in:
...
NDB_VERSION_BUILD has to be numeric
2006-03-17 12:10:08 +01:00
kent@mysql.com
882d9b6e1f
configure.in:
...
Changed release name to 5.0.19a
ha_innodb.cc:
InnoDB used table locks (not row locks) within stored functions. (Bug #18077 )
2006-03-17 11:32:02 +01:00
andrey@lmy004.
50efe4ed28
fix after manual merge of fix for bug #16396 : Events: Distant-future dates become past dates.
2006-03-17 11:01:45 +01:00
elliot@mysql.com
a37fa18a69
Merge mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-4.1
...
into mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.0
2006-03-17 10:50:01 +01:00
elliot@mysql.com
56fca811bb
BUG#18283 When InnoDB returns error 'lock table full', MySQL can write
...
to binlog too much.
When InnoDB has to rollback a transaction because the lock table has
filled up, it also needs to inform the upper layer that the transaction
was rolled back so that the cached transaction is not written to the
binary log.
2006-03-17 10:25:29 +01:00
andrey@lmy004.
a1d87d6a0d
manual merge
2006-03-17 09:40:48 +01:00
bell@production.mysql.com
c5337540af
Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into production.mysql.com:/usersnfs/abelkin/work-qc-5.0
2006-03-17 00:56:47 +01:00
knielsen@mysql.com
2ad835a71e
Merge bk-internal:/home/bk/mysql-5.1-new
...
into mysql.com:C:/cygwin/home/mysqldev/my/mysql-5.1-new
2006-03-16 22:19:09 +01:00