mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
32052 commits 2784 branches 343 tags 1.6 GiB
Commit graph

10934 commits

Author SHA1 Message Date
lars@mysql.com
e0e39bf656 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new 
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new
 2006-03-22 08:42:45 +01:00
mats@mysql.com
cd550dd5db Post-merge fixes after merging mysql-5.0 with mysql-5.1-new 2006-03-22 00:47:36 +01:00
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
lars@mysql.com
20290ee5f6 Made rpl_flushlog_loop use wait_slave_status instead of sleep. 
This to save 5 seconds of test time.
More test to follow. :-)
 2006-03-21 17:40:51 +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
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
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
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
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
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
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
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
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
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
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
jani@ibmlab.site
ba5c940377 Fixed depedency problem with the following test. 
Without resetting, the next test will not pass.
 2006-03-16 17:44:27 +02:00
jani@ibmlab.site
e94aefcd81 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  ibmlab.site:/home/my/bk/mysql-5.1-new
 2006-03-16 17:44:26 +02:00
msvensson@shellback.(none)
714689969f Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-16 16:05:27 +01:00
msvensson@shellback.(none)
f8ee9e47d5 Remove disabling of rpl_ndb_multi_update2 2006-03-16 16:03:39 +01:00
andrey@lmy004.
92b4381966 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-bug14356
 2006-03-16 14:38:20 +01:00
msvensson@shellback.(none)
5f9138681d Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-16 14:28:23 +01:00
acurtis@xiphis.org
8276474a8c Merge acurtis@bk-internal:/home/bk/mysql-5.1-new 
into  xiphis.org:/home/antony/work2/p1-bug14575.1-mrg2
 2006-03-16 05:02:45 -08:00
msvensson@shellback.(none)
24eaa14b82 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-16 13:42:46 +01:00
acurtis@xiphis.org
e43f49a466 Merge xiphis.org:/home/antony/work2/p1-bug14575.1 
into  xiphis.org:/home/antony/work2/p1-bug14575.1-mrg2
 2006-03-16 04:29:59 -08:00
andrey@lmy004.
05684f1fa6 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-bug14356
 2006-03-16 13:20:34 +01:00
andrey@lmy004.
23888ae52c fix for bug 16408 (Events: crash for an event in a procedure) 
(one patch)
 2006-03-16 13:14:40 +01:00
mikael@zim.(none)
055371d890 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/mikael/bug17772
 2006-03-16 03:24:39 -08:00
msvensson@shellback.(none)
59a4f5fdab Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-16 12:22:07 +01:00
mikael@zim.(none)
89b10826ce BUG#17772 
A crash after ALTER TABLE t1 RENAME ...
 2006-03-16 03:21:15 -08:00
knielsen@mysql.com
8cb582cfda Merge mysql.com:/usr/local/mysql/mysql-4.1 
into  mysql.com:/usr/local/mysql/mysql-5.1-new
 2006-03-16 11:27:50 +01:00
knielsen@mysql.com
28592fec54 Merge mysql.com:/usr/local/mysql/mysql-4.1 
into  mysql.com:/usr/local/mysql/mysql-5.0
 2006-03-16 11:23:09 +01:00
knielsen@mysql.com
d75abf873e Fix bug in mysql-test-run.pl in ^C signal handler. 2006-03-16 11:21:18 +01:00
msvensson@shellback.(none)
fc3a7388ef Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-16 09:56:49 +01:00