mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 20:11:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
41699 commits 2794 branches 343 tags 1.5 GiB
Commit graph

41699 commits

This branch
This branch
All branches
Author SHA1 Message Date
kostja@bodhi.local
df18e193a2 Merge bodhi.local:/opt/local/work/tmp_merge 
into  bodhi.local:/opt/local/work/mysql-5.1-root
 2007-01-15 23:51:52 +03:00
kent@kent-amd64.(none)
f9ac031dd0 Merge mysql.com:/home/kent/bk/tmp2/mysql-5.0-build 
into  mysql.com:/home/kent/bk/tmp2/mysql-5.1-build
 2007-01-15 10:37:27 +01:00
kent@kent-amd64.(none)
cccafa22bc Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  mysql.com:/home/kent/bk/tmp2/mysql-5.1-build
 2007-01-15 10:29:55 +01:00
joerg@trift2.
f5c4d92d82 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/tmp-5.1
 2007-01-14 13:50:16 +01:00
kostja@bodhi.local
16d53afcd2 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
 2007-01-12 22:06:46 +03:00
kostja@bodhi.local
7c298786f1 Merge bodhi.local:/opt/local/work/mysql-4.1-runtime 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
 2007-01-12 22:01:53 +03:00
kostja@bodhi.local
5a99ffdf92 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
 2007-01-12 21:59:17 +03:00
malff/marcsql@weblab.(none)
eda8c901f4 Fixed windows build break 2007-01-12 10:33:44 -07:00
malff/marcsql@weblab.(none)
b73101af15 Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-22687
 2007-01-12 08:11:52 -07:00
kostja@bodhi.local
a7862496ce Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  bodhi.local:/opt/local/work/mysql-4.1-runtime
 2007-01-12 18:06:43 +03:00
joerg@trift2.
4ffada35bf Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  trift2.:/MySQL/M41/mysql-4.1
 2007-01-12 14:40:28 +01:00
gluh@eagle.(none)
90c7557266 Merge mysql.com:/home/gluh/MySQL/Merge/5.0 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-01-12 15:08:40 +04:00
gluh@eagle.(none)
5c5edbdd82 Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-01-12 14:48:59 +04:00
gluh@eagle.(none)
cf41e1ec63 Merge mysql.com:/home/gluh/MySQL/Merge/5.1 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-01-12 14:47:11 +04:00
tnurnberg@mysql.com/sin.azundris.com
90a8092660 Bug#24660: "enum" field type definition problem 
ENUMs weren't allowed to have character 0xff, a perfectly good
character in some locales.  This was circumvented by mapping 0xff in
ENUMs to ',', thereby prevent actual commas from being used. Now if
0xff makes an appearance, we find a character not used in the enum and
use that as a separator. If no such character exists, we throw an
error.

Any solution would have broken some sort of existing behaviour. This
solution should serve both fractions (those with 0xff and those with
',' in their enums), but WILL REQUIRE A DUMP/RESTORE CYCLE FROM THOSE
WITH 0xff IN THEIR ENUMS. :-/ That is, mysqldump with their current
server, and restore when upgrading to one with this patch.
 2007-01-12 11:06:38 +01:00
gluh@mysql.com/eagle.(none)
6d5cf25d20 Merge mysql.com:/home/gluh/MySQL/Merge/4.1 
into  mysql.com:/home/gluh/MySQL/Merge/5.0
 2007-01-12 13:58:08 +04:00
gluh@mysql.com/eagle.(none)
c081e28ef5 Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.0
 2007-01-12 13:57:40 +04:00
gluh@mysql.com/eagle.(none)
a33f2719e2 Function mysql_rm_tmp_tables(): 
fixed valgrind error
fixed indentation
 2007-01-12 13:34:33 +04:00
joerg@trift2.
59e2133e00 Merge trift2.:/MySQL/M41/mysql-4.1 
into  trift2.:/MySQL/M41/push-4.1
 2007-01-12 10:17:39 +01:00
mmj@tiger.mmj.dk
ebb4885357 Merge mjorgensen@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.1-build
 2007-01-11 23:05:13 +01:00
malff/marcsql@weblab.(none)
9655f5fb03 Bug#22687 (Functions UNIQUE_USERS, GROUP_UNIQUE_USERS) 
According to some internal communication, these two functions are place
holders for future enhancements. Because they use a variable number of
parameters, the implementation defined a reserved keyword for them in the
parser grammar.

Unfortunately, doing so creates a bug similar to Bug 21114 reported for the
function FORMAT.

In the 5.1 code base, due to improvements in the code implemented with bug
21114, having a reserved keyword for functions with a variable number of
arguments is not needed any more by the implementation.

As a result, this fix removes the place-holder implementation, and removes
the unnecessary reserved keywords. Should the functions UNIQUE_USERS and
GROUP_UNIQUE_USERS be finally implemented in a later release, the
implementation should sub class Create_native_func in sql/item_create.cc.
For example, see the class Create_func_concat.
 2007-01-11 14:58:05 -07:00
tsmith@siva.hindu.god
bc0e0ba7cc Merge siva.hindu.god:/home/tsmith/m/bk/mysql-5.0-build 
into  siva.hindu.god:/home/tsmith/m/bk/mysql-5.1-build
 2007-01-11 13:50:48 -07:00
joerg@trift2.
d90427abaa Merge trift2.:/MySQL/M50/tmp-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-01-11 20:43:43 +01:00
joerg@trift2.
759b66479c Merge trift2.:/MySQL/M50/tmp1-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-01-11 20:20:43 +01:00
kostja@bodhi.local
b72c2771dc Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
 2007-01-11 22:15:20 +03:00
kostja@bodhi.local
61a4d6e5ed Merge bodhi.local:/opt/local/work/mysql-4.1-runtime 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
 2007-01-11 22:09:48 +03:00
kostja@bodhi.local
bf1005a125 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
 2007-01-11 21:59:28 +03:00
kostja@bodhi.local
dd03d51f22 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  bodhi.local:/opt/local/work/mysql-4.1-runtime
 2007-01-11 21:49:52 +03:00
joerg@trift2.
05d161e04c Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-01-11 19:40:05 +01:00
gkodinov/kgeorge@rakia.gmz
7eebacadad Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  rakia.gmz:/home/kgeorge/mysql/autopush/B25106-5.0-opt
 2007-01-11 19:13:04 +02:00
gkodinov/kgeorge@macbook.gmz
15bcf13182 BUG#25106: A USING clause in combination with a VIEW results in column 
aliases ignored
When a column reference to a column in JOIN USING is resolved and a new 
Item is created for this column the user defined name was lost.
This fix preserves the alias by setting the name of the new Item to the
original alias.
 2007-01-11 19:10:01 +02:00
malff/marcsql@weblab.(none)
f043c7c4bf Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-25183
 2007-01-11 09:15:44 -07:00
gluh@eagle.(none)
215d3da7d2 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-01-11 18:15:40 +04:00
gluh@mysql.com/eagle.(none)
63e5959202 after merge fix 2007-01-11 16:50:34 +04:00
kent@mysql.com/kent-amd64.(none)
e9f9b03263 Merge mysql.com:/home/kent/bk/tmp2/mysql-4.1-build 
into  mysql.com:/home/kent/bk/tmp2/mysql-5.0-build
 2007-01-11 12:43:30 +01:00
kent@mysql.com/kent-amd64.(none)
bd2ec8051d Many files: 
Reverted change for bug#13859, applied smaller patch from Marko
 2007-01-11 12:31:52 +01:00
joerg@trift2.
19b4e4fd75 Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-01-11 11:32:53 +01:00
joerg@trift2.
050a69a794 Merge trift2.:/MySQL/M41/push-4.1 
into  trift2.:/MySQL/M50/push-5.0
 2007-01-11 11:30:44 +01:00
holyfoot/hf@hfmain.(none)
5565157ba0 Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/d2/hf/mr10/my51-mr10
 2007-01-11 13:21:28 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
3ff9dff06a Merge bk@192.168.21.1:mysql-5.0-opt 
into  mysql.com:/d2/hf/mr10/my50-mr10
 2007-01-11 13:18:49 +04:00
mmj@tiger.mmj.dk
49913f2a95 Merge mjorgensen@bk-internal.mysql.com:/home/bk/mysql-5.0-sage 
into  tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.0
 2007-01-11 09:19:32 +01:00
joerg@trift2.
4d12d97cc3 Merge trift2.:/MySQL/M40/clone-4.0 
into  trift2.:/MySQL/M41/push-4.1
 2007-01-10 21:05:13 +01:00
joerg@trift2.
e9f7b6f797 Merge trift2.:/MySQL/M40/upward-4.0 
into  trift2.:/MySQL/M41/push-4.1
 2007-01-10 20:29:14 +01:00
igor@olga.mysql.com
f5f8c35ef2 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1-opt 
into  olga.mysql.com:/home/igor/mysql-4.1-opt
 2007-01-10 10:49:46 -08:00
kent@mysql.com/kent-amd64.(none)
ba7b6e86f2 configure.in: 
Corrected default for --disable-grant-options
 2007-01-10 18:19:51 +01:00
igor@olga.mysql.com
61cd864bc0 Merge olga.mysql.com:/home/igor/mysql-4.1-opt 
into  olga.mysql.com:/home/igor/mysql-5.0-opt
 2007-01-10 08:55:55 -08:00
holyfoot/hf@mysql.com/hfmain.(none)
27d56afcfc Merge bk@192.168.21.1:mysql-5.0 
into  mysql.com:/d2/hf/mr10/my50-mr10
 2007-01-10 20:37:22 +04:00
malff/marcsql@weblab.(none)
cb8174760a Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-25302
 2007-01-10 09:33:43 -07:00
holyfoot/hf@deer.(none)
814c1308ea Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  mysql.com:/home/hf/work/mysql-5.1-mrg
 2007-01-10 18:33:28 +04:00
kent@kent-amd64.(none)
27f9e5571f Merge mysql.com:/home/kent/bk/tmp2/mysql-5.0-build 
into  mysql.com:/home/kent/bk/tmp2/mysql-5.1-build
 2007-01-10 14:51:34 +01:00