serg@serg.mylan
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
jimw@mysql.com
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
acurtis@pcgem.rdg.cyberkinetica.com
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
serg@serg.mylan
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
serg@serg.mylan
2b41b8fa01
post-review fixes. Now ROLLBACK is done in Format_description_log_event
2005-02-17 13:52:16 +01:00
jani@ua141d10.elisa.omakaista.fi
36998b7cb7
Fixed Bug#8042, "mysqld crashes on sighup".
2005-02-17 14:07:28 +02:00
acurtis@pcgem.rdg.cyberkinetica.com
a1bf1c926e
Bug#8147
...
Fix ambigious table error for INSERT..SELECT..UPDATE
2005-02-17 01:33:59 +00:00
guilhem@mysql.com
0987d81ae6
Merge
2005-02-16 21:03:58 +01:00
serg@serg.mylan
5ddb6354a5
after merge fixes
2005-02-16 17:34:02 +01:00
monty@mysql.com
38d1a42481
Merge with 4.1
2005-02-15 17:12:13 +02:00
guilhem@mysql.com
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
monty@mysql.com
44ceb84cdc
Merge with 4.0
2005-02-15 14:49:52 +02:00
monty@mysql.com
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
guilhem@mysql.com
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
serg@serg.mylan
fd828e5b4d
manually merged
2005-02-14 21:50:09 +01:00
bell@sanja.is.com.ua
6da6c5be0c
fixed SP processing for mysql_list_fields() command (BUG#6814)
2005-02-13 21:47:00 +02:00
bell@sanja.is.com.ua
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
bell@sanja.is.com.ua
9b1bf2da5a
merge
2005-02-10 18:01:06 +02:00
konstantin@mysql.com
e9225b2588
Fix -ansi -pedantic compilation failure.
2005-02-10 17:46:27 +03:00
pem@mysql.comhem.se
51296b5399
Added missing #ifdef HAVE_INNOBASE_DB:s in sql_parse.cc.
2005-02-10 11:40:54 +01:00
jimw@mysql.com
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
hf@deer.(none)
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
hf@deer.(none)
b94a482ee9
Precision Math implementation
2005-02-09 02:50:45 +04:00
pem@mysql.comhem.se
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
gluh@gluh.mysql.r18.ru
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
monty@mysql.com
80b3e02462
Fixed bug detected by sp-tests
...
Cleanup during reviews of new pushed code
2005-02-05 16:05:46 +02:00
gluh@gluh.mysql.r18.ru
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
monty@mysql.com
422c2eb868
4.1 -> 5.0 merge
2005-02-03 13:18:30 +02:00
gluh@gluh.mysql.r18.ru
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
jimw@mysql.com
5f0c4ff140
Merge fixes for #8248 , #5569 .
2005-02-02 08:21:11 -08:00
acurtis@pcgem.rdg.cyberkinetica.com
a90d28eb6e
Fix compile problem - line missing.
2005-02-01 23:43:09 +00:00
jimw@mysql.com
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
acurtis@pcgem.rdg.cyberkinetica.com
a67924ecbc
WL#1967
...
Support for COMMIT/ROLLBACK optional arguments
2005-02-01 19:48:05 +00:00
gluh@gluh.mysql.r18.ru
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
acurtis@pcgem.rdg.cyberkinetica.com
941b959cb4
Bug#7011
...
Fix for merge from 4.1
2005-01-31 20:49:37 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
adb91423ac
Bug#7011
...
Merge from 4.1
2005-01-31 15:57:32 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
6a354b1b04
Bug#7011
...
Merge from 4.0
2005-01-31 12:48:00 +00:00
bell@sanja.is.com.ua
25042ae70c
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-01-31 09:36:23 +02:00
acurtis@pcgem.rdg.cyberkinetica.com
500fbf5c0f
Bug#7011
...
Fix replication for multi-update
new test - rpl_multi_update2
2005-01-30 10:24:03 +00:00
serg@serg.mylan
3c5060981f
query_id and my_xid -> ulonglong
...
fix for binlog+autocommit+tclog
comments, style fixes
2005-01-27 22:38:56 +01:00
gluh@gluh.mysql.r18.ru
6afbb3d627
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
2005-01-27 20:01:37 +03:00
gluh@gluh.mysql.r18.ru
ac14d40dde
A fix: information_schema test fails on Mac OSX
2005-01-27 13:16:51 +03:00
gluh@gluh.mysql.r18.ru
a6315a8ad9
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
2005-01-26 20:58:47 +03:00
jimw@mysql.com
94da57dc65
Always call vio_in_addr() so that thd->remote is
...
always initialized. (Bug #5569 )
2005-01-25 12:06:55 -08:00
konstantin@mysql.com
6c3a4aee18
Fix two typos in comments.
2005-01-25 17:25:46 +03:00
gluh@gluh.mysql.r18.ru
849ef34156
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
2005-01-25 11:42:50 +03:00
serg@serg.mylan
c76405a7ee
merged
2005-01-24 19:41:42 +01:00
gluh@gluh.mysql.r18.ru
e492c1b44e
Additional fix for WL#1629: SHOW with WHERE(discussed with PeterG)
...
- Do not allow a column list as part of SHOW WITH WHERE task.
- The WHERE clause must accept field names which are
valid in SHOW, not INFORMATION_SCHEMA names.
2005-01-24 18:44:54 +03:00
serg@serg.mylan
79240013b2
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-01-24 15:50:13 +01:00
serg@serg.mylan
67ba2e367a
fixes/cleanups according to Coverity report
2005-01-24 15:48:25 +01:00