mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 11:31:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
51196 commits 2791 branches 343 tags 1.7 GiB
Commit graph

51196 commits

This branch
This branch
All branches
Author SHA1 Message Date
timour/tkatchaounov@lapi.mysql.com
8091abbf90 BUG#32694 post-merge adjustment of EXPLAIN results for 5.1. 2007-12-08 23:54:07 +02:00
timour/tkatchaounov@lapi.mysql.com
3ef980cd84 Merge lapi.mysql.com:/home/tkatchaounov/mysql/src/5.0#32694 
into  lapi.mysql.com:/home/tkatchaounov/mysql/src/5.1#32694
 2007-12-08 23:15:43 +02:00
timour/tkatchaounov@lapi.mysql.com
9be915e743 Fix for BUG#32694 "NOT NULL table field in a subquery produces invalid results" 
The problem was that when convert_constant_item is called for subqueries,
this happens when we already started executing the top-level query, and
the field argument of convert_constant_item pointed to a valid table row.
In turn convert_constant_item used the field buffer to compute the value
of its item argument. This copied the item's value into the field,
and made equalities with outer references always true.
  
The fix saves/restores the original field's value when it belongs to an
outer table.
 2007-12-08 23:05:00 +02:00
evgen@moonbone.local
a836535cde Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  moonbone.local:/work/32482-5.1-opt-mysql
 2007-12-07 22:56:16 +03:00
evgen@moonbone.local
f1bff761d9 Bug#32482: Crash for a query with ORDER BY a user variable. 
The Item_func_set_user_var::register_field_in_read_map() did not check 
that the result_field was null.This caused server crashes for queries that
required order by such a field and were executed without using a temporary
table.

The Item_func_set_user_var::register_field_in_read_map() now checks the
result_field to be not null.
 2007-12-07 22:54:47 +03:00
gkodinov/kgeorge@macbook.gmz
2264ca3646 Merge macbook.gmz:/Users/kgeorge/mysql/work/mysql-5.0-opt 
into  macbook.gmz:/Users/kgeorge/mysql/work/merge-5.1-opt
 2007-12-07 16:15:58 +02:00
holyfoot/hf@hfmain.(none)
d296c9d178 Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/home/hf/work/26921/my51-26921
 2007-12-07 10:22:02 +04:00
holyfoot/hf@hfmain.(none)
901dc028f9 Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/home/hf/work/26921/my51-26921
 2007-12-07 10:10:02 +04:00
holyfoot/hf@hfmain.(none)
d26de7bee0 Merge mysql.com:/home/hf/work/26921/my50-26921 
into  mysql.com:/home/hf/work/26921/my51-26921
 2007-12-07 09:39:31 +04:00
holyfoot/hf@hfmain.(none)
45edb712d4 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  mysql.com:/home/hf/work/mrg/my51-mrg
 2007-12-06 22:31:22 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
3f27019281 partition_archive tests added 2007-12-06 22:17:42 +04:00
tnurnberg@sin.intern.azundris.com
5cab4a77e1 Bug#31177: Server variables can't be set to their current values 
initialise limits properly for getopt_ll_limit()
(fixes falcon_opt test)
 2007-12-06 18:03:30 +01:00
holyfoot/hf@hfmain.(none)
18e6de9f15 Merge mysql.com:/home/hf/work/32247/my51-32247 
into  mysql.com:/home/hf/work/mrg/my51-mrg
 2007-12-06 16:43:52 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
dc01dba255 Bug #32247 Test reports wrong value of "AUTO_INCREMENT" (on a partitioned InnoDB table). 
ha_partition::update_create_info() just calls update_create_info
of a first partition, so only get the autoincrement maximum
of the first partition, so SHOW CREATE TABLE can show
small AUTO_INCREMENT parameters.
Fixed by implementing ha_partition::update_create_info() in a way
other handlers work.
HA_ARCHIVE:stats.auto_increment handling made consistent with other engines
 2007-12-06 16:39:42 +04:00
tnurnberg@white.intern.koehntopp.de
d349effe11 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  mysql.com:/misc/mysql/31177/51-31177
 2007-12-06 08:56:04 +01:00
tnurnberg@white.intern.koehntopp.de
987ec3f306 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/misc/mysql/31177/50-31177
 2007-12-06 08:46:01 +01:00
tnurnberg@white.intern.koehntopp.de
fe8d3dddf2 Merge mysql.com:/misc/mysql/31177/50-31177 
into  mysql.com:/misc/mysql/31177/51-31177
 2007-12-06 01:46:49 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
b1e77cfc31 Bug#31177: Server variables can't be set to their current values 
additional fixes for BDB and correct assignment of both signed
and unsigned 64-bit data to unsigned system variables
 2007-12-06 01:28:01 +01:00
mhansson@dl145s.mysql.com
e602ae16af Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  dl145s.mysql.com:/data0/mhansson/my51-bug30234
 2007-12-04 16:53:55 +01:00
mhansson@dl145s.mysql.com
22b4b4db04 Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  dl145s.mysql.com:/data0/mhansson/my50-bug30234
 2007-12-04 11:32:11 +01:00
gluh@mysql.com/eagle.(none)
aaf5b7fddd test case fix 2007-12-04 12:48:11 +04:00
tnurnberg@mysql.com/white.intern.koehntopp.de
ae8b22d91e Bug#31177: Server variables can't be set to their current values 
additional fixes for 64-bit
---
Merge mysql.com:/misc/mysql/31177/50-31177
into  mysql.com:/misc/mysql/31177/51-31177
---
Bug#31177: Server variables can't be set to their current values

additional 5.1 fixes (for plugins)
 2007-12-04 01:17:52 +01:00
mhansson@dl145s.mysql.com
8639c8683c Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  dl145s.mysql.com:/data0/mhansson/my51-bug30234
 2007-12-03 12:34:36 +01:00
mhansson/martin@linux-st28.site
cb1bc4e355 Bug#30234: Post-null-merge fix 
Restores files that were automerged during null merge.
 2007-12-03 11:39:49 +01:00
mhansson/martin@linux-st28.site
6c4eafdae3 Merge linux-st28.site:/home/martin/mysql/src/bug30234/my50-bug30234 
into  linux-st28.site:/home/martin/mysql/src/bug30234/my51-bug30234
 2007-12-03 11:31:44 +01:00
mhansson/martin@linux-st28.site
d2c6ed55ef Bug#30234: Unexpected behavior using DELETE with AS and USING 
Anti-patch. This patch undoes the previously pushed patch. It is 
null-merged in versions 5.1 and above since there the original 
patch is still desired.
 2007-12-03 10:08:58 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
658f66e36e Bug#31177: Server variables can't be set to their current values 
additional fixes for 64-bit
 2007-12-03 10:01:56 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
2cc07b287a Bug#31177: Server variables can't be set to their current values 
extra 5.1 fixes
 2007-12-02 05:18:34 +01:00
tnurnberg@white.intern.koehntopp.de
f561e8ddf3 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  mysql.com:/misc/mysql/31177/51-31177
 2007-12-02 03:19:07 +01:00
tnurnberg@white.intern.koehntopp.de
55d6d04df0 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/misc/mysql/31177/50-31177
 2007-12-02 01:48:43 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
56274466be Bug#31177: Server variables can't be set to their current values 
5.1+ specific fixes (plugins etc.)
 2007-12-01 19:55:06 +01:00
tnurnberg@white.intern.koehntopp.de
9598ea4f45 Merge mysql.com:/misc/mysql/31177/50-31177 
into  mysql.com:/misc/mysql/31177/51-31177
 2007-12-01 15:53:56 +01:00
tnurnberg@white.intern.koehntopp.de
b445a5443e Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  mysql.com:/misc/mysql/32707/51-32707
 2007-12-01 13:10:59 +01:00
tnurnberg@white.intern.koehntopp.de
3900e55aa8 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/misc/mysql/32707/50-32707
 2007-12-01 13:09:16 +01:00
holyfoot/hf@hfmain.(none)
2c89535410 Merge mysql.com:/home/hf/work/mrg/my41-mrg 
into  mysql.com:/home/hf/work/mrg/my50-mrg
 2007-12-01 13:14:49 +04:00
holyfoot/hf@hfmain.(none)
d28aac3f33 Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/home/hf/work/mrg/my51-mrg
 2007-12-01 13:13:16 +04:00
holyfoot/hf@hfmain.(none)
0b3c91e1f1 Merge bk@192.168.21.1:mysql-5.0-opt 
into  mysql.com:/home/hf/work/mrg/my50-mrg
 2007-12-01 13:12:31 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
dd4fc01714 Merge bk@192.168.21.1:mysql-4.1-opt 
into  mysql.com:/home/hf/work/mrg/my41-mrg
 2007-12-01 13:09:57 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
9229218d22 merging 2007-12-01 13:07:28 +04:00
tnurnberg@white.intern.koehntopp.de
4826e97cac Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  mysql.com:/misc/mysql/32180/51-32180
 2007-12-01 02:02:13 +01:00
tnurnberg@white.intern.koehntopp.de
73b96ecc16 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/misc/mysql/32180/50-32180
 2007-12-01 01:59:48 +01:00
holyfoot/hf@hfmain.(none)
34de307073 Merge mysql.com:/home/hf/work/mrg/my50-mrg 
into  mysql.com:/home/hf/work/mrg/my51-mrg
 2007-12-01 00:46:44 +04:00
holyfoot/hf@hfmain.(none)
ad52a590cf Merge mysql.com:/home/hf/work/mrg/my41-mrg 
into  mysql.com:/home/hf/work/mrg/my50-mrg
 2007-11-30 22:29:34 +04:00
holyfoot/hf@hfmain.(none)
83e0fef847 Merge mysql.com:/home/hf/work/32624/my50-32624 
into  mysql.com:/home/hf/work/mrg/my50-mrg
 2007-11-30 22:28:23 +04:00
holyfoot/hf@hfmain.(none)
bea42da135 Merge mysql.com:/home/hf/work/32374/my50-32374 
into  mysql.com:/home/hf/work/mrg/my50-mrg
 2007-11-30 22:26:48 +04:00
holyfoot/hf@hfmain.(none)
a756bfd408 Merge mysql.com:/home/hf/work/31890/my51-31890 
into  mysql.com:/home/hf/work/mrg/my51-mrg
 2007-11-30 22:25:03 +04:00
holyfoot/hf@hfmain.(none)
baeea12b21 Merge mysql.com:/home/hf/work/30430/my51-30430 
into  mysql.com:/home/hf/work/mrg/my51-mrg
 2007-11-30 22:19:05 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
1446f74d8f Bug #30430 crash:./mtr --embedded-server --ps-protocol cache_innodb func_misc... 
PS-protocol data is stored in different format - the MYSQL_RECORDS->data
contains the link to the record content, not to array of the links to
the field's contents. So we have to handle it separately for
embedded-server query cache.
 2007-11-30 22:17:11 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
d02855d915 Merge mysql.com:/home/hf/work/31900/my41-31900 
into  mysql.com:/home/hf/work/mrg/my41-mrg
 2007-11-30 22:08:29 +04:00
kaa@polly.(none)
6ebd599cc6 Merge polly.(none):/home/kaa/src/opt/bug9481/my51-bug9481 
into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt
 2007-11-30 18:49:29 +03:00