mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-25 00:04:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
27120 commits 2774 branches 343 tags 1.6 GiB
Commit graph

27120 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
hf@deer.(none)
19869bd19f Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.clean
 2005-10-13 19:53:45 +05:00
hf@deer.(none)
27d8bc5b1f merging 2005-10-13 19:51:07 +05:00
monty@mysql.com
0f9a3c1cf9 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into  mysql.com:/home/my/mysql-4.0
 2005-10-13 17:42:15 +03:00
monty@mysql.com
144c873e39 Review of new pushed code 
- No need to check *ref when ref is checked (Simple optimization fix)
 2005-10-13 17:41:55 +03:00
tomas@poseidon.ndb.mysql.com
a6a0bd4ab5 Bug #13461 Slave Cluster crashed on restart of two data nodes in seperate groups 
- ensure in ndb_mgmd that the stop command is not issued if a node is restarting
- added some new error messages
- in ndbcntr on master check so that node does not shutdown id shutdoen in progress
 2005-10-13 16:38:38 +02:00
hf@deer.(none)
62ffbea5e4 merging 2005-10-13 19:31:09 +05:00
bar@mysql.com
fa0dec7531 Merge abarkov@bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0.char1
 2005-10-13 19:27:44 +05:00
bar@mysql.com
7c81d7fc69 ctype_utf8.result, ctype_utf8.test: 
New syntax: CHAR(x USING charset)
  Adding test case.
sql_yacc.yy:
  New syntax: CHAR(x USING charset)
  Adding new parser rule.
item_strfunc.h:
  New syntax: CHAR(x USING charset)
  Adding a new constructor.
 2005-10-13 19:24:47 +05:00
hf@deer.(none)
c933505d2d Fix for bug #3874 (Group by field is not considered) 2005-10-13 19:23:52 +05:00
jani@ua141d10.elisa.omakaista.fi
cf173e553d Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-tmp
 2005-10-13 17:21:54 +03:00
jani@ua141d10.elisa.omakaista.fi
5dad171618 Some Netware related fixes and fixes for Metrowerks compiler. 2005-10-13 17:21:14 +03:00
bar@mysql.com
c229567887 Merge abarkov@bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0.b9278
 2005-10-13 19:19:05 +05:00
bar@mysql.com
39b0712cf7 type_binary.result, type_binary.test: 
new file
mysql_fix_privilege_tables.sql, mysql_create_system_tables.sh:
  Adding true BINARY/VARBINARY: fixing "password" type, not to be 0x00-padding.
Many files:
  Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
  Adding true BINARY/VARBINARY: new pad_char structure member.
ctype-bin.c:
  Adding true BINARY/VARBINARY: new pad_char structure member.
  New strnxfrm, with two trailing length bytes.
field.cc:
  Adding true BINARY/VARBINARY.
 2005-10-13 19:16:19 +05:00