mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 15:24:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
42998 commits 2778 branches 343 tags 1.6 GiB
Commit graph

42998 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
ae27eeea58 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/tmpmerge
 2007-02-13 10:50:44 -05:00
df@kahlann.erinye.com
b22c89d36b .del-README.txt-renamed: 
Rename: BitKeeper/deleted/.del-README.txt -> BitKeeper/deleted/.del-README.txt-renamed
 2007-02-13 16:31:24 +01: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
msvensson@pilot.mysql.com
b74a067246 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-13 10:27:39 +01:00
msvensson@pilot.mysql.com
7e6e518a47 Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.1 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-13 10:00:59 +01:00
msvensson@pilot.mysql.com
7dcdbdf37b Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-13 10:00:53 +01:00
msvensson@pilot.mysql.com
818cb094fc Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-13 09:56:56 +01: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
kent@kent-amd64.(none)
f4ab936ff1 Merge mysql.com:/home/kent/bk/tmp3/mysql-5.0 
into  mysql.com:/home/kent/bk/tmp3/mysql-5.1
 2007-02-12 23:37:12 +01:00
holyfoot/hf@hfmain.(none)
fd95800632 Merge mysql.com:/home/hf/work/20691/my51-20691 
into  mysql.com:/home/hf/work/25492/my51-25492
 2007-02-13 01:24:00 +04: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
holyfoot/hf@mysql.com/hfmain.(none)
fb4ad23994 Merge bk@192.168.21.1:mysql-5.0-opt 
into  mysql.com:/home/hf/work/25492/my50-25492
 2007-02-13 01:20:02 +04:00
holyfoot/hf@hfmain.(none)
27a7ac2735 Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/home/hf/work/25492/my51-25492
 2007-02-13 01:19:19 +04:00
holyfoot/hf@hfmain.(none)
d8ffdf040a Merge mysql.com:/home/hf/work/25492/my50-25492 
into  mysql.com:/home/hf/work/25492/my51-25492
 2007-02-13 01:00:27 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
74cbe92c6b Merge mysql.com:/home/hf/work/25492/my41-25492 
into  mysql.com:/home/hf/work/25492/my50-25492
 2007-02-13 00:59:30 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
0004fa3c5b bug #25492 (Invalid deallocation in mysql_stmt_fetch) 2007-02-13 00:55:45 +04:00
pekka@orca.ndb.mysql.com
5914074e16 Merge clam.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-merge 
into  clam.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-merge
 2007-02-12 21:13:19 +01:00
gluh@mysql.com/eagle.(none)
674868dabf Merge mysql.com:/home/gluh/MySQL/Merge/5.0 
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
 2007-02-12 19:36:47 +04:00
gluh@mysql.com/eagle.(none)
81d4297d60 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
 2007-02-12 19:29:20 +04:00
gluh@mysql.com/eagle.(none)
6caff6f708 valgrind error fix 2007-02-12 19:28:49 +04:00
gkodinov/kgeorge@macbook.gmz
35a84c0aa6 Fixed MacOSX/Intel linking problem 
Common symbols with and without initialization
 cause the apple linker to exclude then from the
 list of global symbols.
 2007-02-12 16:02:53 +02: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
ffdf7b159b sql_view.cc: 
Post fix for bug#12122.
information_schema.result:
  Corrected test case after fixing bug#12122.
 2007-02-11 22:52:12 +03: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
igor@olga.mysql.com
3fe9de2879 Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug26017
 2007-02-09 12:58:35 -08:00
igor@olga.mysql.com
951fe3cade Fixed bug #26017. 
Objects of the class Item_equal contain an auxiliary member
eval_item of the type cmp_item that is used only for direct 
evaluation of multiple equalities. Currently a multiple equality
is evaluated directly only in the cases when the equality holds
at most for one row in the result set.
The compare collation of eval_item was determined incorectly.
It could lead to returning incorrect results for some queries.
 2007-02-09 12:54:50 -08:00
evgen@moonbone.local
380c220545 Bug#23170: LAST_INSERT_ID isn't reset to 0 in INSERT .. SELECT when no rows were 
inserted.

The select_insert::send_eof() function now resets LAST_INSERT_ID variable if
no rows were inserted.
 2007-02-09 22:25:09 +03:00
joerg@trift2.
7a87a3c416 Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-02-09 12:53:53 +01:00
joerg@trift2.
f6a4f27c97 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  trift2.:/MySQL/M51/push-5.1
 2007-02-09 12:32:26 +01:00
jbruehe@bk-internal.mysql.com
9c77c4d119 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-build
 2007-02-09 12:23:43 +01:00
joerg@trift2.
e8669853b9 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-02-09 12:08:41 +01:00
gkodinov/kgeorge@macbook.gmz
a119169bf0 Merge bk-internal:/home/bk/mysql-5.0-opt 
into  macbook.gmz:/Users/kgeorge/mysql/work/B22344-5.0-opt
 2007-02-09 11:07:35 +02:00
gkodinov/kgeorge@macbook.gmz
053f7a42e6 Addendum to fix of bug #22344 : removed dead code. 2007-02-09 11:05:23 +02:00
kent@mysql.com/kent-amd64.(none)
3bb1114647 make_binary_distribution.sh: 
Copy "ndb_size.tmpl" into binary distribution (Bug#24191)
 2007-02-09 00:10:40 +01:00
tsmith@siva.hindu.god
498756195a Merge siva.hindu.god:/home/tsmith/m/bk/51 
into  siva.hindu.god:/home/tsmith/m/bk/maint/51
 2007-02-08 16:02:58 -07:00