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

12825 commits

Author SHA1 Message Date
msvensson@pilot.blaudden
3359145790 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-19 18:25:55 +01:00
msvensson@pilot.blaudden
bcb7521b0e Remove unportable constructs in mysqldump.test 2007-02-19 18:25:42 +01:00
msvensson@pilot.blaudden
9aeb8297b5 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-19 18:25:10 +01:00
msvensson@pilot.blaudden
b540ae533d Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-19 18:24:32 +01:00
msvensson@pilot.blaudden
d2fe11cb56 Commment out two test's thats just confusing for cmd.exe 2007-02-19 18:23:59 +01:00
msvensson@pilot.blaudden
420bf2a398 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-19 18:20:33 +01:00
msvensson@pilot.blaudden
cb84744145 Add cat_file command to mysqltest 2007-02-19 18:19:47 +01:00
msvensson@pilot.blaudden
16bce5b815 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-19 17:41:01 +01:00
msvensson@pilot.blaudden
1fd7e01089 Use a temporary file to pass UTF8 chars to "mysql" in a portable 
way
 2007-02-19 17:40:34 +01:00
msvensson@pilot.blaudden
afd6fb94e0 Remove non portable exec's from csv.test 2007-02-19 17:06:47 +01:00
msvensson@pilot.blaudden
f65cb65d23 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-19 16:42:54 +01:00
msvensson@pilot.blaudden
91967e5550 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-19 16:40:11 +01:00
msvensson@pilot.blaudden
d2c02cd10d Add "append_file" command to mysqltest 2007-02-19 16:39:50 +01:00
msvensson@pilot.blaudden
a6ac991c83 Replace "exec rm" with remove_file and "exec touch" with "write_file" 2007-02-19 15:46:32 +01:00
msvensson@pilot.blaudden
c122f59c0c Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-19 12:05:13 +01:00
msvensson@pilot.blaudden
478bb9e27c Update for running with cmd.exe directly 2007-02-19 12:03:42 +01:00
msvensson@pilot.blaudden
7970e9534b Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-16 16:13:56 +01:00
msvensson@pilot.blaudden
ee38195c90 Use " instead of ' to avoid win problem with ' 2007-02-16 16:08:08 +01:00
msvensson@pilot.blaudden
486dfab32b Merge 192.168.0.10:mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-15 15:56:38 +01:00
cmiller@calliope.local.cmiller/calliope.local
80a35bfd39 Merge calliope.local.cmiller:/Volumes/Source/src/mysql-4.1-maint--bug25126 
into  calliope.local.cmiller:/Volumes/Source/src/mysql-4.1-maint
 2007-02-14 12:24:11 -05:00
cmiller@calliope.local
81a46371a9 Merge calliope.local.cmiller:/Volumes/Source/src/mysql-5.0-maint 
into  calliope.local.cmiller:/Volumes/Source/src/mysql-5.1-maint
 2007-02-14 11:38:39 -05:00
cmiller@calliope.local.cmiller/calliope.local
cbdaf5b641 Merge calliope.local.cmiller:/Volumes/Source/src/mysql-4.1-maint--bug25126 
into  calliope.local.cmiller:/Volumes/Source/src/mysql-5.0-maint
 2007-02-14 11:27:37 -05:00
cmiller@zippy.cornsilk.net
434830547b Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2007-02-14 10:57:01 -05:00
msvensson@pilot.mysql.com
b6f78aa153 Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-14 14:51:49 +01:00
msvensson@pilot.mysql.com
24a242bee1 Merge pilot.mysql.com:/home/msvensson/mysql/bug18628/my50-bug18628 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-14 14:45:15 +01:00
msvensson@pilot.mysql.com
45fe5879f4 Bug#18628 mysql-test-run: security problem(part1) 
- Implement --secure-file-priv=<dir> option that limits
  "load_file", "LOAD DATA" and "SELECT .. INTO OUTFILE" to work 
  with files in specified dir.
 - Use above option for mysqld in mysql-test-run.pl
 2007-02-14 14:44:34 +01:00
igor@olga.mysql.com
d36e264cc5 Post-merge fix 2007-02-13 19:59:46 -08:00
igor@olga.mysql.com
452c134d3f Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  olga.mysql.com:/home/igor/mysql-5.1-opt
 2007-02-13 16:08:01 -08:00
ibabaev@bk-internal.mysql.com
0df74eae05 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
 2007-02-14 00:58:54 +01:00
igor@olga.mysql.com
c84ee7079c Post-merge fix 2007-02-13 15:49:42 -08:00
ibabaev@bk-internal.mysql.com
266300142e Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-opt
 2007-02-13 23:35:06 +01:00
igor@olga.mysql.com
a196ccafe6 Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/mysql-5.1-opt
 2007-02-13 13:31:23 -08:00
igor@olga.mysql.com
273d016aad Post-merge fix. 2007-02-13 13:15:23 -08:00
cmiller@zippy.cornsilk.net
11e8f48734 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
 2007-02-13 10:54:04 -05:00
igor@olga.mysql.com
fb9e0ad3be Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/mysql-5.1-opt
 2007-02-13 01:34:36 -08:00
igor@olga.mysql.com
0461228a70 Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug26209
 2007-02-12 23:10:33 -08:00
ibabaev@bk-internal.mysql.com
4aab8494e9 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
 2007-02-13 00:00:27 +01:00
holyfoot/hf@mysql.com/hfmain.(none)
30614d22c1 Merge mysql.com:/home/hf/work/20691/my50-20691 
into  mysql.com:/home/hf/work/25492/my50-25492
 2007-02-13 01:23:23 +04:00
holyfoot/hf@hfmain.(none)
a7e4f44a25 Merge mysql.com:/home/hf/work/20691/my50-20691 
into  mysql.com:/home/hf/work/20691/my51-20691
 2007-02-13 01:22:43 +04:00
tnurnberg@mysql.com/sin.azundris.com
293352cbe4 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/home/tnurnberg/24660/50-24660
 2007-02-12 14:49:34 +01:00
tnurnberg@mysql.com/sin.azundris.com
8dc8e07fcf Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  mysql.com:/home/tnurnberg/24660/41-24660
 2007-02-12 14:39:45 +01:00
tnurnberg@mysql.com/sin.azundris.com
ed82b013b8 Merge mysql.com:/home/tnurnberg/24660/41-24660 
into  mysql.com:/home/tnurnberg/24660/50-24660
 2007-02-12 14:32:06 +01:00
tnurnberg@mysql.com/sin.azundris.com
db7ac2c0c7 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-02-12 14:31:44 +01:00
gluh@mysql.com/eagle.(none)
47e537b47c Bug#24630 Subselect query crashes mysqld 
The crash happens because second filling of the same I_S table happens in
case of subselect with order by. table->sort.io_cache previously allocated
in create_sort_index() is deleted during second filling
(function get_schema_tables_result). There are two places where
I_S table can be filled: JOIN::exec and create_sort_index().
To fix the bug we should check if the table was already filled
in one of these places and skip processing of the table in second.
 2007-02-12 16:06:14 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
8299b596ae bug #20691 (INSERT (DEFAULT) may insert garbage with NO DEFAULT NOT NULL field) 
Some fields (GEOMETRY first of all) can't be handled properly in this
case at all. So we return an error in this case
 2007-02-12 15:41:36 +04:00
igor@olga.mysql.com
0583c7c524 Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug26159
 2007-02-11 22:48:40 -08:00
igor@olga.mysql.com
4b1a1d9eb7 Fixed bug #26209. 
The function make_unireg_sortorder ignored the fact that any
view field is represented by a 'ref' object.
This could lead to wrong results for the queries containing
both GROUP BY and ORDER BY clauses.
 2007-02-11 19:36:46 -08:00
evgen@moonbone.local
9e2a0c7528 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/mnt/gentoo64/work/12122-bug-5.0-opt-mysql
 2007-02-11 21:03:40 +03:00
igor@olga.mysql.com
976e747aaf Fixed bug #26159. 
A wrong order of statements in QUICK_GROUP_MIN_MAX_SELECT::reset
caused a crash when a query with DISTINCT was executed by a loose scan
for an InnoDB table that had been emptied.
 2007-02-10 23:55:56 -08:00
evgen@moonbone.local
a241446362 Bug#12122: The MERGE algorithm isn't applicable if the ORDER BY clause is 
present.

A view created with CREATE VIEW ... ORDER BY ... cannot be resolved with
the MERGE algorithm, even when no other part of the CREATE VIEW statement
would require the view to be resolved using the TEMPTABLE algorithm.

The check for presence of the ORDER BY clause in the underlying select is 
removed from the st_lex::can_be_merged() function.
The ORDER BY list of the underlying select is appended to the ORDER BY list
 2007-02-10 00:00:07 +03:00