383c6e312a
don't log BEGIN in auto-commit mode
...
correct end_log_pos for Xid_log_event
2005-02-23 18:26:49 +01:00
25e87cd6f7
Merge 52.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0
...
into 52.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-repl-5.0
2005-02-23 19:22:52 +02:00
41043bb3f5
Merge
2005-02-22 16:39:21 -08:00
df3c8db4f3
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-22 13:14:49 -08:00
a9b40a8c0b
Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0
...
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-repl-5.0
2005-02-22 14:52:26 +02:00
04cffe4dfb
postreview fix
2005-02-22 12:43:49 +02:00
178be07aa3
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-02-22 00:17:56 +01:00
b43029f4eb
bug#8646 - deadlock if long transaction causes binlog rotate
2005-02-22 00:15:31 +01:00
b902a66e27
Fix -ansi -pedantic compilation failure.
2005-02-21 17:27:36 +03:00
cab35adf7e
Review of new pushed code (XA & other)
...
Portability fixes and cleanups
Fixed setting of 'res' in mysql_execute_command()
2005-02-21 14:47:57 +02:00
a11369b999
Merge
2005-02-20 18:49:27 +02:00
10800c1eb5
Merge mysql.com:/home/jimw/my/mysql-4.1-8475
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-18 15:40:17 -08:00
29d1d9a369
Clean up merge for fix for Bug #8350 .
2005-02-18 15:23:17 -08:00
262dd182ef
compilation fixes
2005-02-18 14:42:14 +01:00
c0dda01f76
Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa
2005-02-18 12:02:46 +01:00
1c22de9032
Log each slow query in a multi-statement query to the slow query log.
...
(Bug #8475 )
2005-02-17 11:48:44 -08:00
10ab9e982f
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8147.1
2005-02-17 17:52:49 +00:00
530eecbd99
Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa
2005-02-17 14:00:44 +01:00
2b41b8fa01
post-review fixes. Now ROLLBACK is done in Format_description_log_event
2005-02-17 13:52:16 +01:00
36998b7cb7
Fixed Bug#8042, "mysqld crashes on sighup".
2005-02-17 14:07:28 +02:00
a1bf1c926e
Bug#8147
...
Fix ambigious table error for INSERT..SELECT..UPDATE
2005-02-17 01:33:59 +00:00
0987d81ae6
Merge
2005-02-16 21:03:58 +01:00
5ddb6354a5
after merge fixes
2005-02-16 17:34:02 +01:00
38d1a42481
Merge with 4.1
2005-02-15 17:12:13 +02:00
4f41de1cc5
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-02-15 15:12:50 +01:00
44ceb84cdc
Merge with 4.0
2005-02-15 14:49:52 +02:00
788a2658a3
Better bug fix for #5569 : "Incorrect "Access Denied" error with SAME login DIFFERENT host"
...
This fixes also the reverse lookup bug introduced by the previous patch
2005-02-15 14:42:13 +02:00
55fb16a7a6
1) undoing my fix for BUG#8055 "Trouble with replication from temporary tables and ignores"
...
and fixing it another way (per Monty; a simpler solution which does not increase the number
of binlog events is to always execute DROP TEMPORARY TABLE IF EXISTS on slave). A new test rpl_drop_temp.
2) fixing BUG#8436 "Multiple "stacked" SQL statements cause replication to stop" by setting
thd->query_length to the length of the query being executed, not counting the next queries
if this is a multi-query. Should also improve display of SHOW PROCESSLIST. A new test rpl_multi_query.
2005-02-14 23:47:17 +01:00
fd828e5b4d
manually merged
2005-02-14 21:50:09 +01:00
6da6c5be0c
fixed SP processing for mysql_list_fields() command (BUG#6814)
2005-02-13 21:47:00 +02:00
5040e7cdb4
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-repl-5.0
2005-02-10 20:08:11 +02:00
9b1bf2da5a
merge
2005-02-10 18:01:06 +02:00
e9225b2588
Fix -ansi -pedantic compilation failure.
2005-02-10 17:46:27 +03:00
51296b5399
Added missing #ifdef HAVE_INNOBASE_DB:s in sql_parse.cc.
2005-02-10 11:40:54 +01:00
f391223f19
Fix per-hour user connection limits by making sure that the number of
...
connections is actually reset after an hour, and also fix (unlikely)
conditions under which the per-hour query and connection limits could be
exceeded. (Bug #8350 )
2005-02-08 18:43:27 -08:00
96558f6ad3
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-02-09 02:54:08 +04:00
b94a482ee9
Precision Math implementation
2005-02-09 02:50:45 +04:00
2c26ebe359
WL#2130: Table locking for stored FUNCTIONs
...
Collect all tables and SPs refered by a statement, and open all tables
with an implicit LOCK TABLES. Do find things refered by triggers and views,
we open them first (and then repeat this until nothing new is found), before
doing the actual lock tables.
2005-02-08 20:52:50 +01:00
15273035ce
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
2005-02-07 11:57:14 +03:00
80b3e02462
Fixed bug detected by sp-tests
...
Cleanup during reviews of new pushed code
2005-02-05 16:05:46 +02:00
be5532d36a
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
2005-02-03 20:46:53 +03:00
422c2eb868
4.1 -> 5.0 merge
2005-02-03 13:18:30 +02:00
cacb8d74b4
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
2005-02-03 11:12:01 +03:00
5f0c4ff140
Merge fixes for #8248 , #5569 .
2005-02-02 08:21:11 -08:00
a90d28eb6e
Fix compile problem - line missing.
2005-02-01 23:43:09 +00:00
76ff72d73f
Merge mysql.com:/home/jimw/my/mysql-4.0-5569
...
into mysql.com:/home/jimw/my/mysql-4.0-clean
2005-02-01 15:38:27 -08:00
a67924ecbc
WL#1967
...
Support for COMMIT/ROLLBACK optional arguments
2005-02-01 19:48:05 +00:00
92f04aedf3
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
2005-02-01 12:20:03 +03:00
941b959cb4
Bug#7011
...
Fix for merge from 4.1
2005-01-31 20:49:37 +00:00
adb91423ac
Bug#7011
...
Merge from 4.1
2005-01-31 15:57:32 +00:00
