database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-16 20:23:18 +03:00
Code Activity
54,780 Commits 3,276 Branches 1,097 Tags
bbf344b646005c6fadeb718bc60f811cf8a42cb5
Commit Graph

22318 Commits

Author SHA1 Message Date
iggy@amd64.(none)
8c26615204 Merge amd64.(none):/src/bug24924/my50-bug24924 
into  amd64.(none):/src/bug24924/my51-bug24924
 2007-07-02 14:23:50 -04:00
iggy@amd64.(none)
772c7fc591 Bug#24924 shared-memory-base-name that is too long causes buffer overflow 
- Testcase fixup.
 2007-07-02 14:22:03 -04:00
sergefp@mysql.com
de0cf5d22f Fix testcase to be platform-independent 2007-07-02 22:18:41 +04:00
mikael@dator6.(none)
da7e78cead removed test case no longer supported 2007-07-02 20:11:54 +02:00
skozlov/ksm@virtop.localdomain
4f62ba081a Merge skozlov@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  mysql.com:/home/ksm/commits/mysql-5.1-new-rpl
 2007-07-02 22:09:02 +04:00
lars/lthalmann@mysql.com/dl145k.mysql.com
91ca424640 post-merge fix 2007-07-02 19:33:00 +02:00
cmiller@zippy.cornsilk.net
22afbc0ab0 Merge fix-up. 2007-07-02 12:29:07 -04:00
mikael@dator6.(none)
8ccd9ee981 Merge dator6.(none):/home/mikael/mysql_clones/mysql-5.1-opt 
into  dator6.(none):/home/mikael/mysql_clones/bug18198
 2007-07-02 18:08:27 +02:00
lars/lthalmann@dl145k.mysql.com
4be62a8e7f Merge mysql.com:/nfsdisk1/lars/bk/mysql-5.1 
into  mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl
 2007-07-02 17:45:46 +02:00
lars/lthalmann@dl145k.mysql.com
f969f0000c Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  mysql.com:/nfsdisk1/lars/bk/mysql-5.0-rpl
 2007-07-02 17:02:01 +02:00
cmiller@zippy.cornsilk.net
681ee9694b Merge mysqldev@production.mysql.com:my/mysql-5.0-release 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community
 2007-07-02 10:46:46 -04:00
lars/lthalmann@dl145j.mysql.com
a4c81471e8 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-07-02 13:42:39 +02:00
cmiller@zippy.cornsilk.net
01f572052d Unify profiling SHOW code and INFORMATION_SCHEMA code for 
profiling.  Also,

Bug#26938: profiling client hang if used before enabled

In the SHOW command, not sending header data because we had no 
rows to send was a protocol violation.  Porting the SHOW PROFILE
command to use the Information Schema table avoids that problem.
 2007-07-02 07:27:39 -04:00
lars/lthalmann@dl145j.mysql.com
6f6492b715 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
 2007-07-02 13:22:23 +02:00
svoj@june.mysql.com
717a04774b Merge mysql.com:/home/svoj/devel/mysql/BUG29299/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG29299/mysql-5.1-engines
 2007-07-02 12:36:31 +05:00
svoj@june.mysql.com
0539080296 Merge mysql.com:/home/svoj/devel/bk/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG29299/mysql-5.0-engines
 2007-07-02 12:31:34 +05:00
kostja@bodhi.(none)
1550a5ddee A post-merge fix. 2007-07-02 11:29:07 +04:00
tnurnberg@sin.intern.azundris.com
a403815e3d Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB 
minor fixes to appease pushbuild.
---
Merge sin.intern.azundris.com:/home/tnurnberg/22540/50-22540
into  sin.intern.azundris.com:/home/tnurnberg/22540/51-22540
 2007-07-02 07:34:42 +02:00
tnurnberg@sin.intern.azundris.com
2fbd3a2eca Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB 
minor fixes to appease pushbuild.
 2007-07-02 07:13:40 +02:00
antony@anubis.xiphis.org
673a8708d1 Merge anubis.xiphis.org:/usr/home/antony/work/mysql-5.1-engines 
into  anubis.xiphis.org:/usr/home/antony/work/mysql-5.1-merge
 2007-07-01 20:56:47 -07:00
igor@olga.mysql.com
f8683bfb44 Fixed bug #25798. 
This bug may manifest itself not only with the queries for which
the index-merge access method is chosen. It also may display
itself for queries with DISTINCT.

The bug was in how the Unique::get method used the merge_buffers
function. To compare elements in the the queue employed by
merge_buffers() it must use the buffpek_compare function rather
than the function for binary comparison.
 2007-07-01 15:33:28 -07:00
kostja@bodhi.(none)
674d10270c Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.(none):/opt/local/work/mysql-5.0-runtime
 2007-07-02 02:01:05 +04:00
kostja@bodhi.(none)
7ce3cada45 Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
 2007-07-02 01:55:01 +04:00
kostja@bodhi.(none)
6a5ce49d09 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
 2007-07-02 01:35:52 +04:00
kostja@bodhi.(none)
2d8decabd4 Update a missed test result. 2007-07-02 01:28:20 +04:00
igor@olga.mysql.com
2efac22463 Corrected a test case. 2007-07-01 11:00:29 -07:00
istruewing@synthia.local
754f66cf56 Post.merge fixes 
Fixed warnings
Fixed error numbers
 2007-07-01 11:56:01 +02:00
igor@olga.mysql.com
eea7dd0a77 Made test case platform independent. 2007-07-01 01:59:05 -07:00
igor@olga.mysql.com
f93f44e739 Post-merge fix. 2007-06-30 22:50:14 -07:00
igor@olga.mysql.com
259fdbf9ca Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.1-opt
 2007-06-30 20:49:28 -07:00
igor@olga.mysql.com
38deea2496 Merge olga.mysql.com:/home/igor/mysql-4.1-opt 
into  olga.mysql.com:/home/igor/mysql-5.0-opt
 2007-06-30 16:24:09 -07:00
istruewing@synthia.local
bc3e18cd39 Merge synthia.local:/home/mydev/mysql-5.0-axmrg 
into  synthia.local:/home/mydev/mysql-5.1-axmrg
 2007-06-30 13:17:49 +02:00
tomas@whalegate.ndb.mysql.com
9541810aea Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
 2007-06-30 12:35:41 +02:00
tomas@whalegate.ndb.mysql.com
a23536121b disable with bug no 2007-06-30 12:34:29 +02:00
tomas@whalegate.ndb.mysql.com
8c4b41ed83 disabled test with bug number 2007-06-30 12:01:10 +02:00
tomas@whalegate.ndb.mysql.com
c82aaf4b05 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
 2007-06-30 11:46:20 +02:00
tomas@whalegate.ndb.mysql.com
325d8002f5 ndb test suite cleanup + making ndb_autodiscover3 less flaky 2007-06-30 11:42:41 +02:00
stewart@flamingspork.com[stewart]
1933c20a76 [PATCH] Test for BUG#27404 util thd mysql_parse sig11 when default multibyte charset 
Test that we can start a MySQL Server with a default multibyte charset with
NDB running. Test *really* basic functionality too.

Index: ndb-work/mysql-test/r/rpl_ndb_ctype_ucs2_def.result
===================================================================
 2007-06-30 18:02:54 +10:00
tnurnberg@sin.intern.azundris.com
169ca2a79a Merge sin.intern.azundris.com:/home/tnurnberg/22540/50-22540 
into  sin.intern.azundris.com:/home/tnurnberg/22540/51-22540
 2007-06-30 03:47:03 +02:00
tnurnberg@sin.intern.azundris.com
95b8b0285d Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  sin.intern.azundris.com:/home/tnurnberg/22540/51-22540
 2007-06-30 03:43:21 +02:00
tnurnberg@sin.intern.azundris.com
990c876784 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  sin.intern.azundris.com:/home/tnurnberg/22540/50-22540
 2007-06-30 03:41:31 +02:00
tnurnberg@sin.intern.azundris.com
5b98b71db6 Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB 
previous correction didn't. make sure "tail" is fixed up
when filling cache several times; rework formulae.
---
Merge sin.intern.azundris.com:/home/tnurnberg/22540/50-22540
into  sin.intern.azundris.com:/home/tnurnberg/22540/51-22540
 2007-06-30 03:32:33 +02:00
tnurnberg@sin.intern.azundris.com
1ac88a2b41 Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB 
previous correction didn't. make sure "tail" is fixed up
when filling cache several times; rework formulae.
 2007-06-30 02:30:42 +02:00
istruewing@synthia.local
0fa5fe24a7 Merge synthia.local:/home/mydev/mysql-5.1-amain 
into  synthia.local:/home/mydev/mysql-5.1-axmrg
 2007-06-30 00:45:24 +02:00
istruewing@synthia.local
b747b6b9d9 Merge synthia.local:/home/mydev/mysql-5.1-ateam 
into  synthia.local:/home/mydev/mysql-5.1-axmrg
 2007-06-30 00:42:59 +02:00
gshchepa/uchum@gleb.loc
3b8b31b0be Merge gleb.loc:/home/uchum/work/bk/5.0-opt-29205 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
 2007-06-30 02:47:22 +05:00
cbell/Chuck@mysql_cab_desk.
e36132471c Merge mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl 
into  mysql_cab_desk.:C:/source/c++/mysql-5.1_BUG_28991
 2007-06-29 17:13:52 -04:00
gshchepa/uchum@gleb.loc
3c260e4a9a Fixed bug #29205. 
When a UNION statement forced conversion of an UTF8
charset value to a binary charset value, the byte
length of the result values was truncated to the
CHAR_LENGTH of the original UTF8 value.
 2007-06-30 02:09:50 +05:00
antony@anubis.xiphis.org
ed74cfe087 Merge anubis.xiphis.org:/usr/home/antony/work/mysql-5.0-engines 
into  anubis.xiphis.org:/usr/home/antony/work/5.0-engines-merge
 2007-06-29 14:04:08 -07:00
istruewing@synthia.local
baeaeac8b0 Merge mysqldev@production:/data0/mysqldev/my/mysql-5.1-release 
into  synthia.local:/home/mydev/mysql-5.1-axmrg
 2007-06-29 21:20:39 +02:00