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

48562 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
63dd4251e4 Bug #29634: mysqld_safe does not set err_log variable, error log file is not created 
Dont touch & chmod the err_log file if using syslog (mysqld_safe)
 2007-07-09 16:10:43 -06:00
tsmith@sita.local
0ed9e3eb4c Merge sita.local:/Users/tsmith/m/bk/maint/50 
into  sita.local:/Users/tsmith/m/bk/maint/51
 2007-07-09 15:45:13 -06:00
tsmith@sita.local
06c8087070 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  sita.local:/Users/tsmith/m/bk/maint/50
 2007-07-09 15:38:36 -06:00
tsmith@sita.local
e345a242f4 mysqld_safe.sh: 
Fix a few typos in comments (from Paul DuBois)
 2007-07-09 15:30:19 -06:00
tsmith@sita.local
832eb83777 Merge sita.local:/Users/tsmith/m/bk/maint/50 
into  sita.local:/Users/tsmith/m/bk/maint/51
 2007-07-09 13:28:37 -06: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
92cad567ba Merge sita.local:/Users/tsmith/m/bk/maint/50 
into  sita.local:/Users/tsmith/m/bk/maint/51
 2007-07-09 10:41:58 -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
tsmith@sita.local
1e0d809992 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  sita.local:/Users/tsmith/m/bk/maint/50
 2007-07-09 10:32:04 -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
278a5dfa83 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-maint 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint
 2007-07-09 12:17:47 +02:00
tomas@whalegate.ndb.mysql.com
14a20dad62 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:17:03 +02:00
tomas@whalegate.ndb.mysql.com
658d12aea8 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-07-09 12:15:52 +02: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
tomas@whalegate.ndb.mysql.com
81eb732880 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-maint
 2007-07-09 12:05:07 +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
tsmith@sita.local
00c6793075 Merge sita.local:/Users/tsmith/m/bk/maint/41 
into  sita.local:/Users/tsmith/m/bk/maint/50
 2007-07-09 01:47:33 -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
043cf5bb4a Merge chilla.local:/home/mydev/mysql-5.0-axmrg 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-07-08 22:44:47 +02: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
istruewing@chilla.local
f5fcc9de33 Merge chilla.local:/home/mydev/mysql-4.1-axmrg 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2007-07-08 21:04:54 +02:00
istruewing@chilla.local
246d1d43cb Merge chilla.local:/home/mydev/mysql-5.0-amain 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2007-07-08 21:04:08 +02:00
istruewing@chilla.local
cb88f63e75 Merge chilla.local:/home/mydev/mysql-5.0-ateam 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2007-07-08 21:03:02 +02:00
istruewing@chilla.local
10441bc78a Merge chilla.local:/home/mydev/mysql-4.1-amain 
into  chilla.local:/home/mydev/mysql-4.1-axmrg
 2007-07-08 19:47:08 +02:00
istruewing@chilla.local
cf016f84fa Merge chilla.local:/home/mydev/mysql-4.1-ateam 
into  chilla.local:/home/mydev/mysql-4.1-axmrg
 2007-07-08 19:46:22 +02: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
eac626bde6 Merge gleb.loc:/home/uchum/work/bk/5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-07-08 11:51:09 +05: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