msvensson@pilot.blaudden
a3317f8554
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-02-28 10:53:34 +01:00
msvensson@pilot.blaudden
3a11b2be7e
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-02-28 10:53:06 +01:00
msvensson@pilot.blaudden
44959af241
Bug#26416 mysql-test-run exits with "Hangup" when piped to grep
...
- Thanks to Christian for the patch!
2007-02-28 10:52:51 +01:00
msvensson@pilot.blaudden
258fbc3a1e
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-02-28 10:39:47 +01:00
msvensson@pilot.blaudden
0df3d939b1
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-02-28 10:39:12 +01:00
msvensson@pilot.blaudden
3393c1e489
Bug#26686 mysql-test-run.pl aborts when waitpid returns -1
...
- Add error handling for waitpid returns -1 for "simple run of command"
2007-02-28 10:37:32 +01:00
gluh@eagle.(none)
be248ad0e0
Merge mysql.com:/home/gluh/MySQL/Merge/5.1
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-02-28 13:26:20 +04:00
msvensson@pilot.blaudden
780d434cb5
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-02-28 10:07:37 +01:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
08431e7865
Merge mysql.com:/home/ram/work/b26038/b26038.4.1
...
into mysql.com:/home/ram/work/b26038/b26038.5.0
2007-02-28 12:13:46 +04:00
lars/lthalmann@mysql.com/dl145k.mysql.com
88e1468754
Fix of incorrect merge of test case
2007-02-27 20:57:46 +01:00
sergefp@pylon.mylan
c3970e734c
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into mysql.com:/home/psergey/mysql-5.1-bug26117
2007-02-27 22:05:52 +03:00
sergefp@mysql.com
d61f9e2d89
BUG#26117 "index_merge sort-union over partitioned table crashes"
...
Before the fix:
ha_partition objects had ha_partition::m_part_info==NULL and that caused
crash
After:
- The new ha_partition::clone() function makes the clones use parent's
m_part_info value.
- The parent ha_partition object remains responsible for deallocation of
m_part_info.
2007-02-27 22:01:03 +03:00
lars/lthalmann@dl145k.mysql.com
4265501c9f
Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-02-27 19:20:47 +01:00
monty@mysql.com/narttu.mysql.fi
cfef5d04b3
Remove compiler warnings
2007-02-27 19:31:49 +02:00
msvensson@pilot.blaudden
2f36118018
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-27 15:29:44 +01:00
msvensson@pilot.blaudden
b03f54df25
Merge pilot.blaudden:/home/msvensson/mysql/bug20166/my51-bug20166
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-27 14:55:00 +01:00
msvensson@pilot.blaudden
14cfc7e1ba
Merge pilot.blaudden:/home/msvensson/mysql/bug20166/my50-bug20166
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-02-27 14:54:33 +01:00
msvensson@pilot.blaudden
846e5ad8d3
Bug#20166 mysql-test-run.pl does not test system privilege tables creation
...
- Updates for 5.1
2007-02-27 11:39:29 +01:00
bar@mysql.com
75177d9cf8
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
...
into mysql.com:/home/bar/mysql-5.0.b24478
2007-02-27 12:46:50 +04:00
gluh@mysql.com/eagle.(none)
e5bd4308b4
after merge fix
2007-02-27 12:16:41 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
fe8b1495f3
Fix for bug #25834 : Test failure in "func_group"
...
Round the results of std() for some calls with double arguments
to avoid double math precision problems.
2007-02-27 11:01:58 +04:00
cbell/Chuck@mysql_cab_desk.
995f2ae13f
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-02-26 14:33:58 -05:00
cbell/Chuck@mysql_cab_desk.
e9481608c3
Merge cbell@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
...
into mysql_cab_desk.:C:/source/c++/mysql-5.0-rpl
2007-02-26 14:30:44 -05:00
cbell/Chuck@mysql_cab_desk.
d7e4de9937
BUG#20141 "User-defined variables are not replicated properly for
...
SF/Triggers in SBR mode."
BUG#14914 "SP: Uses of session variables in routines are not always replicated"
BUG#25167 "Dupl. usage of user-variables in trigger/function is not replicated
correctly"
User-defined variables used inside of stored functions/triggers in
statements which did not update tables directly were not replicated.
We also had problems with replication of user-defined variables which
were used in triggers (or stored functions called from table-updating
statements) more than once.
This patch addresses the first issue by enabling logging of all
references to user-defined variables in triggers/stored functions
and not only references from table-updating statements.
The second issue stemmed from the fact that for user-defined
variables used from triggers or stored functions called from
table-updating statements we were writing binlog events for each
reference instead of only one event for the first reference.
This problem is already solved for stored functions called from
non-updating statements with help of "event unioning" mechanism.
So the patch simply extends this mechanism to the case affected.
It also fixes small problem in this mechanism which caused wrong
logging of references to user-variables in cases when non-updating
statement called several stored functions which used the same
variable and some of these function calls were omitted from binlog
as they were not updating any tables.
2007-02-26 14:06:10 -05:00
gluh@mysql.com/eagle.(none)
148332907a
after merge fix
2007-02-26 19:49:24 +04:00
msvensson@pilot.blaudden
eb135547eb
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-02-26 14:56:23 +01:00
msvensson@pilot.blaudden
23b6b4a565
Only allow a version number to be read from "/etc/debian_version"
2007-02-26 14:52:51 +01:00
gluh@eagle.(none)
1d49f79c53
Merge mysql.com:/home/gluh/MySQL/Merge/5.1
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-02-26 17:46:52 +04:00
msvensson@pilot.blaudden
f6e31a2cd1
Merge pilot.blaudden:/home/msvensson/mysql/bug20166/my50-bug20166
...
into pilot.blaudden:/home/msvensson/mysql/bug20166/my51-bug20166
2007-02-26 14:25:59 +01:00
gluh@mysql.com/eagle.(none)
e8635ad3cb
Merge mysql.com:/home/gluh/MySQL/Merge/5.0
...
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
2007-02-26 16:57:45 +04:00
gluh@mysql.com/eagle.(none)
086aa9d3c0
after merge fix
2007-02-26 16:52:54 +04:00
gluh@eagle.(none)
975a23ed0f
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-02-26 15:54:43 +04:00
bar@mysql.com
8f97dea5f8
Bug#24478 DROP TRIGGER is not caught by replicate-*-table filters
...
Problem: DROP TRIGGER was not properly handled in combination
with slave filters, which made replication stop
Fix: loading table name before checking slave filters when
dropping a trigger.
2007-02-26 15:25:43 +04:00
msvensson@pilot.blaudden
c550a45522
Bug#20166 mysql-test-run.pl does not test system privilege tables creation
...
- Use mysql_system_tables.sql to create MySQL system tables in
all places where we create them(mysql_install_db, mysql-test-run-pl
and mysql_fix_privilege_tables.sql)
2007-02-26 11:49:24 +01:00
msvensson@pilot.blaudden
5f7dbe07cd
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-26 11:00:17 +01:00
mats@romeo.(none)
959b881022
Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl
...
into romeo.(none):/home/bk/b25091-mysql-5.1-new-rpl
2007-02-26 10:54:26 +01:00
mats@romeo.(none)
988ae560f3
Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl
...
into romeo.(none):/home/bk/b25091-mysql-5.1-new-rpl
2007-02-26 10:43:31 +01:00
mats@romeo.(none)
f910199270
BUG#25091 (A DELETE statement to mysql database is not logged in ROW format):
...
With this patch, statements that change metadata (in the mysql database)
is logged as statements, while normal changes (e.g., using INSERT, DELETE,
and/or UPDATE) is logged according to the format in effect.
The log tables (i.e., general_log and slow_log) are not replicated at all.
With this patch, the following statements are replicated as statements:
GRANT, REVOKE (ALL), CREATE USER, DROP USER, and RENAME USER.
2007-02-26 10:19:08 +01:00
msvensson@pilot.blaudden
1770993db7
Use binary file mode when writing the modified .TRG file to avoid CR/LF's being added on windows
2007-02-26 09:24:03 +01:00
msvensson@pilot.blaudden
5068ef8854
Workaround non portable use of "grep" and "cut" by loading the whole processlist
...
into temporary table and selecting the correct row with SQL
2007-02-26 09:16:22 +01:00
lars/lthalmann@dl145j.mysql.com
e1867c3156
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-02-25 00:12:14 +01:00
lars/lthalmann@mysql.com/dl145j.mysql.com
1a09fb81fc
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
2007-02-25 00:10:51 +01:00
gbichot@dl145h.mysql.com
2d8af6efe8
rpl_insert_delayed.test:
...
fix after merge: server now returns ER_DUP_ENTRY_WITH_KEY_NAME, not ER_DUP_ENTRY
2007-02-24 16:35:15 +01:00
lars/lthalmann@dl145h.mysql.com
8b39189ee4
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-02-24 11:52:08 +01:00
lars/lthalmann@mysql.com/dl145h.mysql.com
1777f04e39
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
2007-02-24 11:41:31 +01:00
anozdrin/alik@booka.opbmk
14e05467b6
Merge booka.opbmk:/home/alik/Documents/MySQL/devel/5.0-rt-im
...
into booka.opbmk:/home/alik/Documents/MySQL/devel/5.1-rt-im
2007-02-24 13:31:01 +03:00
anozdrin/alik@booka.opbmk
2da113129a
IM test suite fix.
...
Log messages from shell-scripts were put to var/log/<test id>.log
file. Now, this file is used by mysql-test-run.pl. So, move log
messages to var/log/<test id>.script.log.
2007-02-24 13:12:20 +03:00
anozdrin/alik@booka.opbmk
77079d385d
Fix shutdown delay option name according to The Manual.
2007-02-24 13:10:04 +03:00
msvensson@pilot.blaudden
da3c2d387f
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-24 08:20:00 +01:00
msvensson@pilot.blaudden
e4700df9ed
Replace non portable system commmands in trigger-grant
2007-02-24 08:18:57 +01:00