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

13712 commits

Author SHA1 Message Date
igor@olga.mysql.com
e04289704d Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/mysql-5.1-opt
 2007-04-11 15:12:49 -07:00
igor@olga.mysql.com
4bf11f99eb Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/mysql-5.0-opt
 2007-04-11 13:48:02 -07:00
igor@olga.mysql.com
e1efba0225 Post-merge fix. 2007-04-11 12:45:27 -07:00
igor@olga.mysql.com
3b990d2cf4 Merge olga.mysql.com:/home/igor/dev-opt/mysql-4.1-opt-bug27484 
into  olga.mysql.com:/home/igor/mysql-5.0-opt
 2007-04-11 11:57:40 -07:00
igor@olga.mysql.com
520b144007 Fixed bug #27484: a crash when incompatible row expressions with nested rows 
are used as arguments of the IN predicate.
Added a function to check compatibility of row expressions. Made sure that this
function to be called for Item_func_in objects by fix_length_and_dec().
 2007-04-11 11:41:12 -07:00
gkodinov/kgeorge@magare.gmz
4aeb1c896e Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B19372-5.0-opt
 2007-04-11 09:37:01 +03:00
gkodinov/kgeorge@magare.gmz
9514ac9f29 Bug #19372: 
Added a test case.
The problem was fixed by the fix for bug #17379.
The problem was that because of some conditions 
the optimizer always preferred range or full index
scan access methods to lookup access methods even
when the latter were much cheaper.
 2007-04-10 19:08:08 +03:00
gkodinov/kgeorge@magare.gmz
21a136883c Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B27659-5.0-opt
 2007-04-10 16:57:46 +03:00
gkodinov/kgeorge@magare.gmz
aefc060fe5 Bug #27659: 
The optimizer transforms DISTINCT into a GROUP BY
when possible.
It does that by constructing the same structure
(a list of ORDER instances) the parser makes when
parsing GROUP BY.
While doing that it also eliminates duplicates.
But if a duplicate is found it doesn't advance the
pointer to ref_pointer array, so the next 
(and subsequent) ORDER structures point to the wrong
element in the SELECT list.
Fixed by advancing the pointer in ref_pointer_array
even in the case of a duplicate.
 2007-04-10 16:55:48 +03:00
gluh@mysql.com/eagle.(none)
6b2cb10a04 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/home/gluh/MySQL/Bugs/5.0.27069
 2007-04-10 15:02:04 +05:00
gluh@mysql.com/eagle.(none)
b80d373b6a Bug#27069 set with identical elements are created(additional fix) 
issue an error in strict mode
if enum|set column has duplicates members in 'create table'
 2007-04-10 15:01:04 +05:00
holyfoot/hf@hfmain.(none)
26d2908c70 Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt 
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
 2007-04-09 11:46:58 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
bd461b01f0 Merge bk@192.168.21.1:mysql-5.0-opt 
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
 2007-04-09 11:45:14 +05:00
holyfoot/hf@hfmain.(none)
33ed2ead2a Merge bk@192.168.21.1:mysql-5.1 
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
 2007-04-09 11:07:20 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
65535824ba Merge bk@192.168.21.1:mysql-5.0 
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
 2007-04-09 11:06:28 +05:00
kent@kent-amd64.(none)
a16289d550 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/kent/bk/tmp4/mysql-5.1-engines
 2007-04-08 20:48:07 +02:00
kent@mysql.com/kent-amd64.(none)
c282dd3715 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/kent/bk/tmp4/mysql-5.0-engines
 2007-04-08 20:46:40 +02:00
evgen@moonbone.local
d8e6b38ec1 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/mnt/gentoo64/work/27586-bug-5.0-opt-mysql
 2007-04-07 23:09:09 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
171f8badd7 merging fix 2007-04-08 00:05:34 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
7ceefd2b3f after-merging fix 2007-04-07 23:16:03 +05:00
holyfoot/hf@hfmain.(none)
6ffa4b9c84 Merge mysql.com:/home/hf/work/26074/my51-26074 
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
 2007-04-07 16:36:50 +05:00
holyfoot/hf@hfmain.(none)
ce426dd622 Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
 2007-04-07 14:59:53 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
2a5bcc3f3e Merge bk@192.168.21.1:mysql-5.0 
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
 2007-04-07 11:36:02 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
df913ae06a Merge bk@192.168.21.1:mysql-4.1 
into  mysql.com:/d2/hf/mrg/mysql-4.1-opt
 2007-04-07 11:35:14 +05:00
evgen@moonbone.local
c3d9eeb25c Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/mnt/gentoo64/work/27586-bug-5.0-opt-mysql
 2007-04-07 00:56:35 +04:00
evgen@moonbone.local
93c29c10b1 Bug#27586: Wrong autoinc value assigned by LOAD DATA in the 
NO_AUTO_VALUE_ON_ZERO mode.

The table->auto_increment_field_not_null variable wasn't reset after
reading a row which may lead to inserting a wrong value to the auto-increment
field to the following row.

The table->auto_increment_field_not_null variable is reset now right after a
row is being written in the read_fixed_length() and the read_sep_field()
functions.
Removed wrong setting of the table->auto_increment_field_not_null variable in
the read_sep_field() function.
 2007-04-07 00:13:27 +04:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
d0e79056b1 Merge acurtis@bk-internal:/home/bk/mysql-5.0-engines 
into  xiphis.org:/home/antony/work2/mysql-5.0-engines.merge
 2007-04-06 18:07:02 +00:00
acurtis/antony@ltamd64.xiphis.org
78734f145d Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  xiphis.org:/home/antony/work2/mysql-5.1-engines.merge
 2007-04-06 17:18:26 +00:00
tomas@whalegate.ndb.mysql.com
41907655a9 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-runtime 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-04-06 13:53:05 +02:00
holyfoot/hf@mysql.com/hfmain.(none)
acb0a7e08a merging fix 2007-04-06 16:06:10 +05:00
kostja@vajra.(none)
14de569dc3 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  vajra.(none):/opt/local/work/mysql-5.1-runtime
 2007-04-06 14:15:29 +04:00
holyfoot/hf@hfmain.(none)
d08216f1b7 Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt 
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
 2007-04-06 12:45:07 +05:00
kostja@vajra.(none)
3ef7bdd9b9 3d attempt to fix information_schema.test failure on HP-UX. 
Apparently it's the only platform in pushbuild where we 
compile without openssl.
 2007-04-06 00:38:57 +04:00
kostja@vajra.(none)
7d463c1e85 Remove a dead file. 2007-04-05 21:01:09 +04:00
kostja@vajra.(none)
cef9331d7d Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  vajra.(none):/opt/local/work/mysql-5.1-c1
 2007-04-05 20:50:28 +04:00
kostja@vajra.(none)
00b85c49da Post-merge and post-review fixes for the patch for 
Bug#23631 "Events: SHOW VARIABLES doesn't work when mysql.event 
is damaged:
 2007-04-05 20:47:22 +04:00
tsmith@siva.hindu.god
5c95c63193 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  siva.hindu.god:/home/tsmith/m/bk/maint/51
 2007-04-05 10:17:32 -06:00
holyfoot/hf@mysql.com/hfmain.(none)
aef5543019 bug #26074 Mysql crash creating partition 
As we have unified paths inside partition engine, we should look for '/'
as a path separator
 2007-04-05 20:26:18 +05:00
kostja@vajra.(none)
701ed297d0 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  vajra.(none):/opt/local/work/mysql-5.1-c1
 2007-04-05 15:49:46 +04:00
kostja@vajra.(none)
98db230086 A set of changes aiming to make the Event Scheduler more user-friendly 
when there are no up-to-date system tables to support it:
 - initialize the scheduler before reporting "Ready for connections".
   This ensures that warnings, if any, are printed before "Ready for
   connections", and this message is not mangled.
 - do not abort the scheduler if there are no system tables
 - check the tables once at start up, remember the status and disable
   the scheduler if the tables are not up to date.
   If one attempts to use the scheduler with bad tables,
   issue an error message.
 - clean up the behaviour of the module under LOCK TABLES and pre-locking
   mode
 - make sure implicit commit of Events DDL works as expected.
 - add more tests


Collateral clean ups in the events code.

This patch fixes Bug#23631 Events: SHOW VARIABLES doesn't work 
when mysql.event is damaged
 2007-04-05 15:24:34 +04:00
tomas@whalegate.ndb.mysql.com
77a1d31fbc Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-04-05 10:24:37 +02:00
tomas@whalegate.ndb.mysql.com
d04730c06d Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-04-05 10:21:41 +02:00
tomas@whalegate.ndb.mysql.com
a858e44a9d Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-04-05 10:20:56 +02:00
mskold/marty@mysql.com/linux.site
bcac914163 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
 2007-04-05 09:18:37 +02:00
msvensson@pilot.blaudden
bc5462fb44 Add extra INSERT to make usre sync_slave_with_master has job to do 2007-04-05 09:10:22 +02:00
mskold/marty@mysql.com/linux.site
3e8cf5958b Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
 2007-04-05 08:39:12 +02:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
10dffc5a19 Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb 
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj.merge
 2007-04-05 12:26:01 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
c7da27b5b2 Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/mysql-5.0-ndb 
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/mysql-5.0-ndb-bj.merge
 2007-04-05 11:30:19 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
fdf57c7ac2 Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb 
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj.merge
 2007-04-05 10:47:40 +08:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
849e637127 fix test for bug#25721 
did not run properly on a fast Windows machine
 2007-04-04 21:35:58 +00:00