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
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
5fb5f2a9a5 Fix for bug #29652: csv.test failure: two changes conflict after merge 
Problem: we don't take into account the length of the data written
to the temporary data file during update on a CSV table.

Fix: properly calculate the data file length during update.
 2007-07-10 13:09:07 +05:00
gkodinov/kgeorge@magare.gmz
ea9825d67b Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B29070-5.0-opt
 2007-07-10 10:40:49 +03:00
tomas@whalegate.ndb.mysql.com
810db44e4f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint
 2007-07-10 09:03:21 +02:00
tomas@whalegate.ndb.mysql.com
503f86f3ba Bug #29570 
- correct result files
 2007-07-10 09:00:15 +02:00
tsmith@sita.local
4b1da38b13 rpl_misc_functions.result, rpl_misc_functions.test: 
Backport from 5.1 a fix to make this test deterministic
 2007-07-09 13:18:27 -06:00
tsmith@sita.local
59c570ba78 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  sita.local:/Users/tsmith/m/bk/maint/51
 2007-07-09 10:33:33 -06:00
gkodinov/kgeorge@magare.gmz
3e9679e1fa Bug #29070: Error in spatial index 
1. Threat MBR for a key as double[] and convert it only
when about to store it on disk.
2. Remove the redundant function get_double().
 2007-07-09 17:41:24 +03:00
istruewing@chilla.local
4b76695000 Merge chilla.local:/home/mydev/mysql-5.1-ateam 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-07-09 16:06:09 +02:00
svoj@june.mysql.com
c188110565 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG29464/mysql-5.1-engines
 2007-07-09 16:07:08 +05:00
tomas@whalegate.ndb.mysql.com
b66fac4fc1 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint
 2007-07-09 12:07:33 +02:00
tsmith@sita.local
5cba44239a disabled.def: 
post-merge fix: re-enable rpl_udf test
 2007-07-09 03:31:27 -06:00
tsmith@sita.local
5f12f35c34 Merge sita.local:/Users/tsmith/m/bk/51 
into  sita.local:/Users/tsmith/m/bk/maint/51

This merge requires a post-merge fix to remove rpl_udf from
suite/rpl/t/disabled.def.
 2007-07-09 03:27:03 -06:00
tomas@whalegate.ndb.mysql.com
7dd1f323a8 Bug #29570 
- correct result files
 2007-07-09 09:35:27 +02:00
tsmith@sita.local
7b2b10e462 Merge sita.local:/Users/tsmith/m/bk/50 
into  sita.local:/Users/tsmith/m/bk/maint/50
 2007-07-09 01:22:54 -06:00
tsmith@sita.local
1106dddfa2 Merge sita.local:/Users/tsmith/m/bk/41 
into  sita.local:/Users/tsmith/m/bk/maint/41
 2007-07-09 01:21:22 -06:00
tsmith@sita.local
75810fbc22 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  sita.local:/Users/tsmith/m/bk/maint/50
 2007-07-09 01:14:33 -06:00
tnurnberg@mysql.com/sin.intern.azundris.com
3dfc83f1a1 Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB 
dollin' it up for Guilhem ;) -- test streamlined,
better comments, faster code, add'l assert.
 2007-07-09 08:11:38 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
b37c24c439 after-merge fix. 2007-07-09 10:39:49 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
ede22768a9 Merge mysql.com:/home/ram/work/b28808/b28808.5.0 
into  mysql.com:/home/ram/work/b28808/b28808.5.1
 2007-07-09 10:20:45 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
a10759d070 Merge mysql.com:/home/ram/work/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b28808/b28808.5.0
 2007-07-09 10:17:04 +05:00
tsmith@sita.local
c2092ee91b Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  sita.local:/Users/tsmith/m/bk/maint/50
 2007-07-08 19:39:54 -06:00
evgen@moonbone.local
7cab171f64 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/mnt/gentoo64/work/29461-bug-5.0-opt-mysql
 2007-07-09 02:02:18 +04:00
evgen@moonbone.local
ff3fd46c32 Bug#29461: Sort order of the collation wasn't used when comparing characters 
with the space character.

When the my_strnncollsp_simple function compares two strings and one is a prefix
of another then this function compares characters in the rest of longer key
with the space character to find whether the longer key is greater or less.
But the sort order of the collation isn't used in this comparison. This may
lead to a wrong comparison result, wrongly created index or wrong order of the
result set of a query with the ORDER BY clause.

Now the my_strnncollsp_simple function uses collation sort order to compare
the characters in the rest of longer key with the space character.
 2007-07-09 01:23:33 +04:00
istruewing@chilla.local
22ad965856 Merge chilla.local:/home/mydev/mysql-5.1-amain 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-07-08 22:43:39 +02:00
istruewing@chilla.local
660c3fd239 Merge chilla.local:/home/mydev/mysql-5.1-ateam 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-07-08 22:41:49 +02:00
evgen@moonbone.local
c502557183 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  moonbone.local:/mnt/gentoo64/work/29310-bug-5.1-opt-mysql
 2007-07-09 00:04:03 +04:00
evgen@moonbone.local
42d1e3c457 Bug#29310: An InnoDB table was updated when the data wasn't actually changed. 
When a table is being updated it has two set of fields - fields required for
checks of conditions and fields to be updated. A storage engine is allowed
not to retrieve columns marked for update. Due to this fact records can't
be compared to see whether the data has been changed or not. This makes the
server always update records independently of data change.

Now when an auto-updatable timestamp field is present and server sees that
a table handle isn't going to retrieve write-only fields then all of such
fields are marked as to be read to force the handler to retrieve them.
 2007-07-08 18:13:04 +04:00
gshchepa/uchum@gleb.loc
930f711b8f Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-07-08 11:48:57 +05:00
gshchepa/uchum@gleb.loc
b1d230e09f Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
 2007-07-08 11:46:52 +05:00
igor@olga.mysql.com
4d8e0fb50a Post-merge fix. 2007-07-07 20:03:00 -07:00
igor@olga.mysql.com
e06c67443d Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.1-opt
 2007-07-07 17:29:19 -07:00
igor@olga.mysql.com
e1eababbba Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug29417
 2007-07-07 15:45:28 -07:00
gshchepa/uchum@gleb.loc
6aa9e3a4fc Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
 2007-07-08 03:40:01 +05:00
gshchepa/uchum@gleb.loc
e5e750c3c9 Merge gleb.loc:/home/uchum/work/bk/5.1 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-07-08 01:27:07 +05:00
igor@olga.mysql.com
63d538575b Fixed bug #29417. 
An assertion abort could occur for some grouping queries that employed 
decimal user variables with assignments to them.

The problem appeared the constructors of the class Field_new_decimal
because the function my_decimal_length_to_precision did not guarantee
returning decimal precision not greater than DECIMAL_MAX_PRECISION.
 2007-07-07 12:31:55 -07:00
gshchepa/uchum@gleb.loc
3c918268e7 Merge gleb.loc:/home/uchum/work/bk/5.0 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
 2007-07-08 00:19:31 +05:00
igor@olga.mysql.com
87c3d18f6f Fixed bug #29415. 
The cast operation ignored the cases when the precision and/or the scale exceeded
the limits, 65 and 30 respectively. No errors were reported in these cases.
For some queries this may lead to an assertion abort.

Fixed by throwing errors for such cases.
 2007-07-07 10:33:02 -07:00
antony@ppcg5.local
6cb186883f disable federated_innodb test until bug29522 is fixed 2007-07-07 09:28:35 -07:00
gshchepa/uchum@gleb.loc
e657075fcb Merge gleb.loc:/home/uchum/work/bk/5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-07-07 20:14:06 +05:00
df@pippilotta.erinye.com
db3bd6db3b Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1.20 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-07-07 15:26:29 +02:00
ramil/ram@ramil.myoffice.izhnet.ru
f38158f401 Merge mysql.com:/home/ram/work/b29420/b29420.5.0 
into  mysql.com:/home/ram/work/b29420/b29420.5.1
 2007-07-07 12:04:11 +05:00
tsmith@sita.local
165c947e0f Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-engines 
into  sita.local:/Users/tsmith/m/bk/maint/50
 2007-07-06 17:55:46 -06:00
tsmith@sita.local
91e406ebed Merge sita.local:/Users/tsmith/m/bk/50 
into  sita.local:/Users/tsmith/m/bk/maint/50
 2007-07-06 17:50:01 -06:00
antony@ppcg5.local
a6f9981ebd Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  ppcg5.local:/private/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.1-engines.merge
 2007-07-06 14:33:14 -07:00
antony@ppcg5.local
edc4f4b3a6 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  ppcg5.local:/private/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.0-engines.merge
 2007-07-06 14:29:58 -07:00
antony@ppcg5.local
ab4101d62f Merge ppcg5.local:/private/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.0-engines.merge 
into  ppcg5.local:/private/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.1-engines.merge
 2007-07-06 11:39:55 -07:00
antony@ppcg5.local
1988c1c668 fix test for bug29299 2007-07-06 11:35:10 -07:00
tomas@whalegate.ndb.mysql.com
52fd5447a0 WL#3303 
- row based ndb logging also in mixed
 2007-07-06 19:04:11 +02:00
antony@ppcg5.local
6402e4324a Merge anubis.xiphis.org:/usr/home/antony/work/mysql-5.1-engines 
into  anubis.xiphis.org:/usr/home/antony/work/mysql-5.1-engines.merge
 2007-07-06 09:03:50 -07:00
antony@ppcg5.local
2b52524ea5 Merge anubis.xiphis.org:/usr/home/antony/work/mysql-5.0-engines 
into  anubis.xiphis.org:/usr/home/antony/work/mysql-5.0-engines.merge
 2007-07-06 09:00:40 -07:00