mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 19:11:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
21203 commits 2790 branches 343 tags 1.7 GiB
Commit graph

10122 commits

Author SHA1 Message Date
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
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
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
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
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
50f9fc3368 Merge test and results 2005-03-11 11:07:32 -08: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
sergefp@mysql.com
f9322a85a4 Merge mysql.com:/home/psergey/mysql-4.1-bug8711 
into mysql.com:/home/psergey/mysql-5.0-bug8711
 2005-03-11 02:26:38 +03:00
sergefp@mysql.com
763039a17b Merge 2005-03-11 02:23:16 +03:00
sergefp@mysql.com
5d865045c9 Fix for BUG#8711: "<=>" may have true value for NULL arguments, so make 
Item_func_equal::not_null_tables() always return 0.
 2005-03-11 02:17:03 +03:00
acurtis@pcgem.rdg.cyberkinetica.com
759ad1a13e More portability fixes 2005-03-10 19:42:57 +00:00
timour@mysql.com
74dac23915 Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into mysql.com:/home/timka/mysql/src/5.0-dbg
 2005-03-10 17:00:05 +02:00
dlenev@mysql.com
a66a54edee Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/dlenev/src/mysql-5.0-sp
 2005-03-10 16:22:05 +03:00
ramil@mysql.com
ec06f3e762 a fix (bug #9029 Traditional: Wrong SQLSTATE returned for string truncation). 2005-03-10 17:08:45 +04:00
dlenev@brandersnatch.localdomain
3b6aeddc11 Fix for sp.test failure in --ps-protocol mode (2nd attempt). 
Now we should call open_and_lock_tables() even if table list is empty -
to cache stored routines used by query and open and lock tables required
for their execution.
 2005-03-10 16:05:48 +03:00
timour@mysql.com
b9c56257bb Merge 2005-03-10 13:59:48 +02:00
timour@mysql.com
abf659dee9 Merge mysql.com:/home/timka/mysql/src/4.1-bug-7425 
into mysql.com:/home/timka/mysql/src/4.1-dbg
 2005-03-10 11:50:55 +02:00
msvensson@neptunus.(none)
c94952d1f0 Removed unused variable 2005-03-10 10:43:11 +01:00
tomas@poseidon.ndb.mysql.com
c7925bd3be Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2005-03-10 09:20:44 +01:00
serg@serg.mylan
e272ab9772 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-03-10 08:45:28 +01:00
ramil@mysql.com
f98d1a84cf Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/home/ram/work/5.0
 2005-03-10 10:22:35 +04:00
igor@rurik.mysql.com
db4ca33f52 Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0 
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2005-03-09 16:53:20 -08:00
serg@serg.mylan
e40bf3c40b sql/ha_ndbcluster.cc 
after merge fix
sql/sql_parse.cc
    correct max_connections condition
 2005-03-10 00:10:10 +01:00
jimw@mysql.com
9fea6f6d1f Merge bk-internal:/home/bk/mysql-5.0 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-03-09 14:44:58 -08:00
marty@linux.site
d88b75874b Fixed broken 4.1->5.0 merge 2005-03-09 23:38:11 +01:00
acurtis@pcgem.rdg.cyberkinetica.com
3b0e983bf0 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug3788.4
 2005-03-09 22:10:38 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
dde2a985f2 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug3788.4
 2005-03-09 21:59:29 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
1a996a7140 Cleanup for VC++ 2005-03-09 21:53:04 +00:00
dlenev@brandersnatch.localdomain
d3f4a597da Portability fix. 2005-03-10 00:52:47 +03:00
jimw@mysql.com
67c9b3316a Merge bk-internal:/home/bk/mysql-5.0 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-03-09 13:26:11 -08:00
tomas@poseidon.ndb.mysql.com
3e95113461 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2005-03-09 21:19:57 +01:00
lars@mysql.com
1422a2b1b1 Fix complilation failure 2005-03-09 20:49:44 +01:00
igor@rurik.mysql.com
af5d21357e Manual merge 2005-03-09 10:58:52 -08:00
jimw@mysql.com
71fd853121 Merge bk-internal:/home/bk/mysql-5.0 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-03-09 10:40:27 -08:00
serg@serg.mylan
79573a5ee8 after merge fixes 2005-03-09 19:22:30 +01:00
jimw@mysql.com
635ba88a4c Merge bk-internal:/home/bk/mysql-5.0 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-03-09 09:39:05 -08:00
jimw@mysql.com
3c7c548b9a Fix change made to ER_READY by creating a new message, instead. 2005-03-09 08:56:50 -08:00