mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 21:12:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
27136 commits 2784 branches 343 tags 1.6 GiB
Commit graph

27136 commits

This branch
This branch
All branches
Author SHA1 Message Date
igor@rurik.mysql.com
c136e9c43b Fixed bug #12762: 
allowed set functions aggregated in outer subqueries, allowed nested set functions.
 2005-10-15 14:32:37 -07:00
hf@deer.(none)
a5c5b2c658 Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 
into deer.(none):/home/hf/work/mysql-5.0.12991
 2005-10-15 15:24:06 +05:00
mskold@mysql.com
b0ccd008ec Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-10-14 14:14:47 +02:00
mskold@mysql.com
4ddfe56f9a Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-10-14 11:28:01 +02:00
mskold@mysql.com
f9b58b0805 Fix for Bug #13961 Triggers on tables with auto_increment insert bogus values into table (clean version) 2005-10-14 11:23:02 +02:00
bar@mysql.com
e7fa41ebf7 mysql.cc: 
After merge fix.
 2005-10-14 14:19:15 +05:00
bar@mysql.com
aec79cc463 Merge mysql.com:/usr/home/bar/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-5.0
 2005-10-14 14:17:15 +05:00
bar@mysql.com
48238e1b90 Merge mysql.com:/usr/home/bar/mysql-4.1.b13487 
into  mysql.com:/usr/home/bar/mysql-4.1
 2005-10-14 14:07:22 +05:00
bar@mysql.com
a3eea8849c Merge mysql.com:/usr/home/bar/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-5.0
 2005-10-14 14:02:21 +05:00
bar@mysql.com
3369f5bd89 Merge mysql.com:/usr/home/bar/mysql-4.1.b13145 
into  mysql.com:/usr/home/bar/mysql-4.1
 2005-10-14 13:57:38 +05:00
bar@mysql.com
c5bb50869d Merge abarkov@bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0.char1
 2005-10-14 13:50:38 +05:00
monty@mysql.com
a320173935 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2005-10-14 11:45:20 +03:00
monty@mysql.com
4561014afa Fixed compile errors on windows 2005-10-14 11:44:46 +03:00
bar@mysql.com
7f734c168a Merge mysql.com:/usr/home/bar/mysql-5.0.b12547 
into  mysql.com:/usr/home/bar/mysql-5.0.char1
 2005-10-14 13:37:19 +05:00
bar@mysql.com
25e40bd403 ctype_utf8.result: 
after merge fix
  ,
 2005-10-14 13:24:21 +05:00
bar@mysql.com
0bf436a058 Merge mysql.com:/usr/home/bar/mysql-4.1.b13751 
into  mysql.com:/usr/home/bar/mysql-5.0.char1
 2005-10-14 12:07:13 +05:00
bar@mysql.com
5df9c6c2a3 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b13751
 2005-10-14 11:54:10 +05:00
jani@a193-229-222-105.elisa-laajakaista.fi
ea26f5e2ea Had to revert change, because it breaks compilation for 
Netware. Hartmut informed about this.
 2005-10-14 09:32:30 +03:00
bar@mysql.com
ed71fa28fa Merge abarkov@bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0.char1
 2005-10-14 10:49:32 +05:00
jani@a193-229-222-105.elisa-laajakaista.fi
63ac3040a8 Small fixes for Netware. 2005-10-14 08:45:41 +03:00
bar@mysql.com
58343bede3 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b13751
 2005-10-14 09:09:25 +05:00
bar@mysql.com
8bd1ccc642 Merge abarkov@bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0.char1
 2005-10-14 08:20:02 +05:00
patg@krsna.patg.net
63262cfdea Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0
 2005-10-13 17:34:42 -07:00
kent@mysql.com
894bcc3c7d Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-10-14 01:54:01 +02:00
kent@mysql.com
c9d1e83edd configure.in: 
New version 5.0.16
 2005-10-14 01:46:26 +02:00
patg@krsna.patg.net
e13ffdae40 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0
 2005-10-13 15:41:52 -07:00
kent@mysql.com
c6c4f03282 configure.in: 
rc => GA
 2005-10-14 00:03:30 +02:00
monty@mysql.com
95ffa4bb5e Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2005-10-14 00:29:33 +03:00
monty@mysql.com
3da5f1c223 Move handling of suffix_length from strnxfrm_bin() to filesort to ensure proper sorting of all kind of binary objects 
field::sort_key() now adds length last for varbinary/blob
VARBINARY/BLOB is now sorted by filesort so that shorter strings comes before longer ones
Fixed issues in test cases from last merge
 2005-10-14 00:04:52 +03:00
bell@sanja.is.com.ua
f89b2ab09b Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.1
 2005-10-14 00:04:40 +03:00
bell@sanja.is.com.ua
6d6e107f12 - set 'updating' in both tables list if we have two of them (because of subquery) (BUG#13236) 
- fixed test
 2005-10-14 00:02:38 +03:00
patg@krsna.patg.net
188021177f Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0
 2005-10-13 13:47:11 -07:00
patg@krsna.patg.net
d86f40650f BUG# 13146 
Re-application of patch to clean 5.0 tree. Fixed issue with ANSI quotes 
when dumping triggers
 2005-10-13 13:42:56 -07:00
lenz@mysql.com
2115b397ca Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/my/mysql-4.1
 2005-10-13 22:29:50 +02:00
lenz@mysql.com
89e10f34c3 Merge mysql.com:/space/my/mysql-4.1 into mysql.com:/space/my/mysql-5.0 2005-10-13 22:16:24 +02:00
lenz@mysql.com
b72e1afbcc Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1 2005-10-13 22:11:49 +02:00
lenz@mysql.com
c93927eef0 - added a usermod call in the postinstall section of the RPM spec file 
to assign a potential existing mysql user to the correct user group (BUG#12823)
 2005-10-13 22:10:54 +02:00
lenz@mysql.com
a315d1be76 RPM spec file fixes: 
- added a usermod call to assign a potential existing mysql user to the
   correct user group (BUG#12823)
 - Save the perror binary built during Max build so it supports the NDB
   error codes (BUG#13740)
 - added a separate macro "mysqld_group" to be able to define the
   user group of the mysql user seperately, if desired.
 2005-10-13 22:01:02 +02:00
monty@mysql.com
6f5baa1eba Merge mysql.com:/home/my/mysql-4.1 
into  mysql.com:/home/my/mysql-5.0
 2005-10-13 20:18:37 +03:00
monty@mysql.com
1436494a72 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2005-10-13 20:18:36 +03:00
bar@mysql.com
fee9c13568 Merge abarkov@bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0.b9278
 2005-10-13 22:18:35 +05:00
bar@mysql.com
4a7324a4de Merge abarkov@bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0.b9278
 2005-10-13 22:18:34 +05:00
jani@ua141d10.elisa.omakaista.fi
38a5d34a48 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
 2005-10-13 20:18:34 +03:00
tomas@poseidon.ndb.mysql.com
ea7d837c31 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2005-10-13 19:18:33 +02:00
monty@mysql.com
49a30ef513 Fixes during review of new pushed code 2005-10-13 19:40:46 +03:00
jani@ua141d10.elisa.omakaista.fi
3ef920a7c7 Merged from 4.1. 2005-10-13 19:34:15 +03:00
bar@mysql.com
bf1a3bc030 select.result, mysqldump-max.result: 
after merge fix.
range.result:
  fixing result accordingly
  ,
cast.result:
  after merge fix
range.test:
  Avoid SELECT'ing of BINARY column not to output 0x00 bytes.
 2005-10-13 21:28:44 +05:00
monty@mysql.com
829a4831b1 Fixes during review of new code 2005-10-13 19:24:01 +03:00
monty@mysql.com
852a745966 Use 4.1 code 2005-10-13 18:48:58 +03:00
jani@ua141d10.elisa.omakaista.fi
2dd1e4f94e Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-tmp 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
 2005-10-13 18:23:53 +03:00