sergefp@mysql.com
62465a98e2
Merge mysql.com:/home/psergey/mysql-4.1-bug8510
...
into mysql.com:/home/psergey/mysql-5.0-bug8510
2005-03-15 09:29:54 +03:00
sergefp@mysql.com
e7e2a8c8eb
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-bug8510
2005-03-15 04:09:41 +03:00
konstantin@mysql.com
6a2ef5577c
WL#926 "AVG(DISTINCT) and other distincts", part 2 (out of 3): clean up
...
Item_sum_count_distinct, and
deploy Unique for use with COUNT(DISTINCT) if there is no blob
column in the list of DISTINCT arguments.
2005-03-15 03:46:19 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
98e83555a5
Merge 4.1 - 5.0
2005-03-15 01:14:59 +02:00
serg@serg.mylan
57adc4d740
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-14 20:45:10 +01:00
serg@serg.mylan
f04bef8faf
merged
2005-03-14 18:46:30 +01:00
serg@serg.mylan
3613f8c262
sql/log.cc
...
don't set LOG_EVENT_BINLOG_IN_USE_F for relay logs
sql/sql_repl.cc
clear LOG_EVENT_BINLOG_IN_USE_F flag before sending an event to a slave
2005-03-14 17:53:24 +01:00
gluh@gluh.mysql.r18.ru
354a93842f
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
2005-03-14 19:47:46 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
9ec8d87328
Updated error message to be more informative. Previous error message
...
"Access denied to database mysql" was actually not just misleading, but
also wrong.
Bug#7905.
2005-03-14 16:59:09 +02:00
mskold@mysql.com
f2db341abe
Removed unnecessary current_thd
2005-03-14 15:53:44 +01:00
gluh@gluh.mysql.r18.ru
ee434e5cc9
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
2005-03-14 17:27:10 +03:00
mskold@mysql.com
7092c7dec2
WL#2353 EXPLAIN support for condition pushdown
2005-03-14 15:26:10 +01:00
serg@serg.mylan
dba1e0889a
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-14 14:47:51 +01:00
mskold@bk-internal.mysql.com
ca3391c7e7
Removed files that disabled ndb tests
2005-03-14 12:27:02 +01:00
msvensson@neptunus.(none)
13ec961c3a
BUG#6554 Problem Building MySql on Fedora Core 3
...
- Moved static variables defined inside of function to file scope to avoid this linking problem on FC3
2005-03-14 12:07:49 +01:00
mskold@bk-internal.mysql.com
c30095c920
Marked missing file gone
2005-03-14 11:37:26 +01:00
mskold@bk-internal.mysql.com
c7f46d678a
Removed
2005-03-14 11:12:54 +01:00
serg@serg.mylan
ada959edf8
anotehr fix for Item_func_isnotnull::not_null_tables()
2005-03-14 11:04:42 +01:00
serg@serg.mylan
a6b3b8fa98
print more information
2005-03-14 09:27:34 +01:00
marty@linux.site
20ca32862a
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into linux.site:/home/marty/MySQL/mysql-5.0
2005-03-14 09:21:15 +01:00
serg@serg.mylan
9248f0d714
Item_func_isnotnull::not_null_tables - return 0 if not top-level item
2005-03-13 23:56:25 +01:00
konstantin@mysql.com
5d2107f993
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/media/sda1/mysql/mysql-5.0-926
2005-03-14 01:47:24 +03:00
serg@serg.mylan
8986ffebde
print xa recovery progress
...
add names to handlertons
trans_need_2pc() macro
2005-03-13 21:58:09 +01:00
konstantin@mysql.com
22915b3ad5
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/media/sda1/mysql/mysql-5.0-926
2005-03-13 23:53:30 +03:00
konstantin@mysql.com
983c75f05e
WL#926 "SUM(DISTINCT) and AVG(DISTINCT)": improvement of SUM(DISTINCT) and
...
implementation of AVG(DISTINCT) which utilizes the approach with Fields.
The patch implemented in October is portede to the up-to-date tree
containing DECIMAL type.
Tests for AVG(DISTINCT) (although there is not much to test provided
that SUM(DISTINCT) works), cleanups for COUNT(DISTINCT) and GROUP_CONCAT()
will follow in another changeset.
2005-03-13 23:50:43 +03:00
heikki@hundin.mysql.fi
ad4057f14c
row0mysql.c:
...
Correct web links
fil0fil.c:
Correct (?) English grammar
2005-03-13 22:46:57 +02:00
serg@serg.mylan
18343b9454
correct not_null_tables() for XOR and AND
...
correct top_level_item for XOR
2005-03-13 16:34:40 +01:00
heikki@hundin.mysql.fi
a95f09e228
set_var.cc, mysqld.cc, ha_innodb.cc, sql_class.h:
...
Add a settable session variable innodb_support_xa; setting it to 0 can save up to 10 % of CPU time and 150 bytes of space in each undo log
trx0trx.h, trx0undo.c, trx0trx.c, trx0roll.c:
Enable XA if innodb_support_xa is not set to 0; make prepare to do log fsync's according to innodb_flush_log_at_trx_commit
2005-03-13 12:49:39 +02:00
igor@rurik.mysql.com
536728c5e8
join_outer.test:
...
Correction after manual merge.
2005-03-13 01:07:01 -08:00
igor@rurik.mysql.com
7d8b91060d
Manual merge
2005-03-13 00:40:55 -08:00
igor@rurik.mysql.com
a90d2bd97c
join_outer.result, join_outer.test:
...
Added a test case for bug #9017 .
item_cmpfunc.h:
A wrong not_null_tables method for Item_cond_xor
caused a conversion of a left join into an inner join
that was not valid.
2005-03-12 23:31:52 -08:00
serg@serg.mylan
0c31836fa5
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-12 20:17:16 +01:00
serg@serg.mylan
32700d1430
if no xa recovery (or after it):
...
warning on startup if prepared foreign xids
error on startup if prepared our xids
temporarily: always rollback prepared our xids instead of an error
2005-03-12 20:09:54 +01:00
jimw@mysql.com
f463143158
Update tests and test results after merge, disable broken NDB tests
2005-03-11 15:06:03 -08:00
jimw@mysql.com
c56a00ec98
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-03-11 12:47:29 -08:00
jimw@mysql.com
441f863f52
Merge mysql.com:/home/jimw/my/mysql-5.0-8902
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-03-11 12:46:11 -08:00
jimw@mysql.com
eaea82d3af
Merge query_cache tests
2005-03-11 12:38:38 -08:00
serg@serg.mylan
a85613f62c
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-11 21:37:52 +01:00
serg@serg.mylan
7b19170cf7
BUG#9101 - RELEASE/ROLLBACK TO SAVEPOINT did not forget savepoints correctly
2005-03-11 21:10:41 +01:00
jimw@mysql.com
d114066174
Merge mysql.com:/home/jimw/my/mysql-4.1-8513
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-03-11 11:08:04 -08:00
jimw@mysql.com
50f9fc3368
Merge test and results
2005-03-11 11:07:32 -08:00
marko@hundin.mysql.fi
7486a5be1d
row0sel.c:
...
row_sel_store_mysql_rec(): Remove unused variable "index".
2005-03-11 17:24:43 +02:00
joerg@mysql.com
24716cba44
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/M41/mysql-4.1
2005-03-11 11:32:56 +01:00
joerg@mysql.com
31eb1c89ee
Keep the Perl version of 'mysql-test-run' in sync with the shell script.
2005-03-11 11:08:27 +01:00
ramil@mysql.com
31a1510ff0
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b9029
2005-03-11 14:01:24 +04:00
ramil@mysql.com
ec41753240
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b9029
2005-03-11 12:30:55 +04:00
ramil@mysql.com
bf5794622d
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0
2005-03-11 12:29:12 +04:00
mwagner@here.mwagner.org
b6288b1e3f
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into here.mwagner.org:/Users/mwagner/work/bk/mysql-4.1
2005-03-10 19:56:58 -06:00
mwagner@here.mwagner.org
b0314c1035
Merge here.mwagner.org:/Users/mwagner/work/bk/mysql-4.1
...
into here.mwagner.org:/Users/mwagner/work/bk/mysql-5.0
2005-03-10 19:46:51 -06:00
mwagner@here.mwagner.org
f1eb5b965a
Do-solaris-pkg:
...
Many changes to improve error handling, and fix problem of multiple packaging processes trampling each other (32 & 64bit at the same time)
2005-03-10 19:42:52 -06:00