thek@adventure.(none)
400aec95f7
Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
2007-08-21 14:54:09 +02:00
thek@adventure.(none)
588a528f5a
Merge adventure.(none):/home/thek/Development/cpp/bug30269/my51-bug30269
...
into adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
2007-08-21 14:04:31 +02:00
thek@adventure.(none)
1317079fd0
Merge adventure.(none):/home/thek/Development/cpp/bug30269/my50-bug30269
...
into adventure.(none):/home/thek/Development/cpp/bug30269/my51-bug30269
2007-08-21 13:44:01 +02:00
thek@adventure.(none)
acfe3fc924
Bug#30269 Query cache eats memory
...
Although the query cache doesn't support retrieval of statements containing
column level access control, it was still possible to cache such statements
thus wasting memory.
This patch extends the access control check on the target tables to avoid
caching a statement with column level restrictions.
Views are excepted and can be cached but only retrieved by super user account.
2007-08-21 13:43:09 +02:00
malff/marcsql@weblab.(none)
1c27dd1d67
Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base
...
into weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge
2007-08-20 11:13:31 -06:00
tsmith@ramayana.hindu.god
a7b5c540ba
Merge ramayana.hindu.god:/home/tsmith/m/bk/51
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-08-18 00:36:18 -06:00
davi@moksha.local
f87e6b866f
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into moksha.local:/Users/davi/mysql/push/mysql-5.1-runtime
2007-08-17 17:13:11 -03:00
davi@moksha.local
fa7ba431df
Bug#29936 (Stored Procedure DML ignores low_priority_updates setting)
...
This is a follow up for the patch for Bug#26162 "Trigger DML ignores low_priority_updates setting", where the stored procedure ignores the session setting of low_priority_updates.
2007-08-17 17:11:08 -03:00
thek@adventure.(none)
4b6c103f09
Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
2007-08-17 17:34:18 +02:00
thek@adventure.(none)
c12feca450
Merge adventure.(none):/home/thek/Development/cpp/bug30269/my51-bug30269
...
into adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
2007-08-17 17:26:38 +02:00
thek@adventure.(none)
5d5519edde
Merge adventure.(none):/home/thek/Development/cpp/bug30269/my50-bug30269
...
into adventure.(none):/home/thek/Development/cpp/bug30269/my51-bug30269
2007-08-17 16:59:20 +02:00
thek@adventure.(none)
a4248c2dd3
Bug #30269 Query cache eats memory
...
Although the query cache doesn't support retrieval of statements containing
column level access control, it was still possible to cache such statements
thus wasting memory.
This patch extends the access control check on the target tables to avoid
caching a statement with column level restrictions.
2007-08-17 16:55:20 +02:00
davi@moksha.local
a63738db6c
Bug#25856 (HANDLER table OPEN in one connection lock DROP TABLE in another one)
...
mysql_ha_open calls mysql_ha_close on the error path (unsupported) to close the (opened) table before inserting it into the tables hash list handler_tables_hash) but mysql_ha_close only closes tables which are on the hash list, causing the table to be left open and locked.
This change moves the table close logic into a separate function that is always called on the error path of mysql_ha_open or on a normal handler close (mysql_ha_close).
2007-08-17 11:34:12 -03:00
mats@kindahl-laptop.dnsalias.net
f8692e4cc9
Minor fix to let the build proceed.
2007-08-17 13:22:31 +02:00
mats@kindahl-laptop.dnsalias.net
112c64a00d
Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl
...
into kindahl-laptop.dnsalias.net:/home/bk/fix-mysql-5.1-rpl
2007-08-17 11:00:03 +02:00
lars/lthalmann@mysql.com/localhost.localdomain.(none)
4ecac78ff7
Empty changeset to restart pushbuild
2007-08-17 00:10:46 +02:00
tsmith@ramayana.hindu.god
18ffae6ab6
Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-08-16 12:03:49 -06:00
kostja@bodhi.(none)
b9fd0eeb5e
Last tweak for doxygen cleanup. The number of doxygen warnings is 0 now.
2007-08-16 21:54:41 +04:00
kostja@bodhi.(none)
beb61609a1
Fix doxygen warnings.
2007-08-16 21:14:47 +04:00
tsmith@ramayana.hindu.god
49891223c3
Bug #29474 : 21587 Regression Ever increasing open tables/fd when using HANDLER READ + DELETE
...
Revert the fix for bug 21587. That bug will be re-opened, and a new
fix must be created.
2007-08-16 10:56:09 -06:00
kostja@bodhi.(none)
b2716c0dad
Doxygen warnings.
2007-08-16 19:52:55 +04:00
kostja@bodhi.(none)
97adcb6054
Fix doxygen warning.
2007-08-16 18:07:48 +04:00
kostja@bodhi.(none)
86946eb6a8
Fix doxygen warning (declaration and definition mismatch).
2007-08-16 17:59:12 +04:00
mats@kindahl-laptop.dnsalias.net
1b85aab28a
Minor code fixes to help Doxygen generate good documentation.
2007-08-16 11:43:03 +02:00
mats@kindahl-laptop.dnsalias.net
1fc1bd7f53
Renaming MASTER_INFO to Master_info in order to follow the coding
...
standards (and help Doxygen generating good documentation).
2007-08-16 08:52:50 +02:00
mats@kindahl-laptop.dnsalias.net
9c4ef25c55
Renaming RELAY_LOG_INFO and st_relay_log_info to follow coding standards
...
(and be more friendly to Doxygen by removing unnecessary typedefs).
2007-08-16 07:37:50 +02:00
tsmith@ramayana.hindu.god
5e926bc120
NULL MERGE this ChangeSet to 5.1
...
Apply innodb-5.0-ss1696 snapshot
Fixes:
- Bug#20090: InnoDB: Error: trying to declare trx to enter InnoDB
- Bug#23710: crash_commit_before fails if innodb_file_per_table=1
At InnoDB startup consider the case where log scan went beyond
checkpoint_lsn as a crash and initiate crash recovery code path.
- Bug#28781: InnoDB increments auto-increment value incorrectly with ON DUPLICATE KEY UPDATE
We need to do some special AUTOINC handling for the following case:
INSERT INTO t (c1,c2) VALUES(x,y) ON DUPLICATE KEY UPDATE ...
We need to use the AUTOINC counter that was actually used by
MySQL in the UPDATE statement, which can be different from the
value used in the INSERT statement.
- Bug#29097: fsp_get_available_space_in_free_extents() is capped at 4TB
Fix by typecasting the variables before multiplying them, so that the
result of the multiplication is of type "unsigned long long".
- Bug#29155: Innodb "Parallel recovery" is not prevented
Fix by enabling file locking on FreeBSD. It has been disabled because
InnoDB has refused to start on FreeBSD & LinuxThreads, but now it
starts just fine.
2007-08-15 17:20:54 -06:00
tsmith@ramayana.hindu.god
a5fdd2332b
Merge ramayana.hindu.god:/home/tsmith/m/bk/51
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-08-15 15:48:57 -06:00
tsmith@ramayana.hindu.god
e2d64f2878
Merge ramayana.hindu.god:/home/tsmith/m/bk/50
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2007-08-15 15:48:03 -06:00
lars/lthalmann@dl145k.mysql.com
2c893c14da
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-08-15 21:30:45 +02:00
kostja@bodhi.(none)
4f97c96eb2
Add replication group (comments).
2007-08-15 20:11:16 +04:00
kostja@bodhi.(none)
2537a87fb5
Provide initial module structure to Doxygen.
2007-08-15 19:08:44 +04:00
kostja@bodhi.(none)
46b8a07dc5
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-08-15 17:46:20 +04:00
kostja@bodhi.(none)
91fe15bb9d
Fix doxygen warnings.
2007-08-15 17:43:08 +04:00
malff/marcsql@weblab.(none)
f5dc545cb1
Changed whitespace and indentation only, no logic change.
2007-08-14 20:31:06 -06:00
tsmith@ramayana.hindu.god
fa9bacb25c
Updates to allow innodb.test to be run with --embedded-server,
...
including a small change to build_table_filename().
2007-08-14 15:35:19 -06:00
gshchepa/uchum@gleb.loc
c40fe57fb5
Merge gleb.loc:/home/uchum/work/bk/5.0
...
into gleb.loc:/home/uchum/work/bk/5.0-opt
2007-08-14 13:44:15 +05:00
tsmith@ramayana.hindu.god
541203b360
Merge ramayana.hindu.god:/home/tsmith/m/bk/51
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-08-13 12:46:35 -06:00
tsmith@ramayana.hindu.god
7812c2d38a
Merge ramayana.hindu.god:/home/tsmith/m/bk/50
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2007-08-13 12:46:02 -06:00
istruewing@synthia.local
f0c883f3fb
Merge synthia.local:/home/mydev/mysql-5.0-amain
...
into synthia.local:/home/mydev/mysql-5.0-axmrg
2007-08-13 20:45:36 +02:00
msvensson@pilot.(none)
732356b152
Bug#29804 UDF parameters don't contain correct string length
...
- Export 'check_const_len_init' from udf_example.dll
2007-08-13 09:46:09 +02:00
gshchepa/uchum@gleb.loc
db6ec3f71f
Merge gleb.loc:/home/uchum/work/bk/5.1
...
into gleb.loc:/home/uchum/work/bk/5.1-opt
2007-08-11 02:00:51 +05:00
gshchepa/uchum@gleb.loc
c04f57ccef
Merge gleb.loc:/home/uchum/work/bk/5.0
...
into gleb.loc:/home/uchum/work/bk/5.0-opt
2007-08-11 01:32:04 +05:00
cbell/Chuck@mysql_cab_desk.
6497bd2f9e
Merge cbell@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
...
into mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl
2007-08-10 15:15:20 -04:00
cbell/Chuck@mysql_cab_desk.
08282643ab
Merge mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl
...
into mysql_cab_desk.:C:/source/c++/mysql-5.1_BUG_22086
2007-08-10 14:58:46 -04:00
cbell/Chuck@mysql_cab_desk.
e8ea4b84c0
BUG#22086 : Extra Slave Col: Char(5) on slave and Char(10) on master cause mysqld crash
...
This patch adds functionality to row-based replication to ensure the
slave's column sizes are >= to that of the master.
It also includes some refactoring for the code from WL#3228.
2007-08-10 12:48:01 -04:00
msvensson@pilot.(none)
62102f54a2
Merge bk-internal:/home/bk/mysql-5.1-maint
...
into pilot.(none):/data/msvensson/mysql/my51-bug29804
2007-08-09 10:37:50 +02:00
msvensson@pilot.(none)
9d06483f72
Bug#29804 UDF parameters don't contain correct string length
...
- Fix warnings
- Export 'check_const_len' from udf_example.dll
2007-08-09 10:21:28 +02:00
kostja@bodhi.(none)
a3b210d408
Apply patch for Bug#27806 table comments not passed in to storage engine
...
during "CREATE ... LIKE ..."
Only affects engine writers.
No change in server behaviour.
2007-08-08 14:02:07 +04:00
kostja@bodhi.(none)
b4eb961fef
Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime
...
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-08-08 11:45:13 +04:00