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

46973 commits

This branch
This branch
All branches
Author SHA1 Message Date
bar@bar.myoffice.izhnet.ru
58aaf6af2d Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b26711 
into  mysql.com:/home/bar/mysql-work/mysql-5.1.b26711
 2007-06-07 13:43:20 +05:00
bar@bar.myoffice.izhnet.ru
c86b91ee92 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 
into  mysql.com:/home/bar/mysql-work/mysql-5.0.b26711
 2007-06-07 13:17:19 +05:00
bar@mysql.com/bar.myoffice.izhnet.ru
fef1be0548 Bug#26711 "Binary content 0x00 sometimes becomes 0x5C 0x00 after dump/load" 
Problem: "SELECT INTO OUTFILE" created incorrect dumps for BLOBs,
so "LOAD DATA" later incorrectly interpreted 0x5C as the second
byte of a multi-byte sequence, instead of escape character.
Fix: adding escaping of multi-byte heads.
 2007-06-07 13:16:49 +05:00
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
89639e7679 yellow warnings on pb. Setting the plug of a harmless warning. 2007-06-06 14:34:17 +03:00
skozlov/ksm@mysql.com/virtop.localdomain
69e2b72522 WL#3694, fix for events 2007-06-05 23:59:05 +04:00
lars/lthalmann@mysql.com/dl145h.mysql.com
7965816fff Manual merge 2007-06-05 03:02:59 +02:00
lars/lthalmann@dl145j.mysql.com
f402776d3b Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-06-05 01:20:50 +02:00
lars/lthalmann@dl145h.mysql.com
98501127fb Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-06-05 01:15:07 +02:00
lars/lthalmann@dl145h.mysql.com
b53b448d45 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
 2007-06-05 01:14:10 +02:00
skozlov/ksm@mysql.com/virtop.localdomain
caa1560408 WL#3694 2007-06-04 20:44:25 +04:00
igor@olga.mysql.com
76b580b84e Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  olga.mysql.com:/home/igor/mysql-5.1-opt
 2007-06-04 05:57:57 -07:00
igor@olga.mysql.com
d0cb11e6ba Post-merge fix. 2007-06-04 05:55:27 -07:00
skozlov/ksm@mysql.com/virtop.localdomain
789088fc5b WL#3694, updated by pushbuild errors 2007-06-04 16:50:29 +04:00
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
4137125f34 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl 
into  dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/tmp/merge_5.0
 2007-06-04 15:08:55 +03:00
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
f544286789 Bug #27716 multi-update did partially and has not binlogged 
manual merge with 5.0: automatic merge went incorrectly; fixing tests in rbr mode.
 2007-06-04 15:02:40 +03:00
skozlov/ksm@mysql.com/virtop.localdomain
ed427617cf WL#3694, Added option files for master/slave 2007-06-04 14:45:36 +04:00
skozlov/ksm@mysql.com/virtop.localdomain
62610402bf WL#3694, Result file for test case moved to proper directory 2007-06-04 14:39:34 +04:00
skozlov/ksm@mysql.com/virtop.localdomain
da4dfefa5e WL#3694 Replication of Invocation and Invoked Features Testing 2007-06-04 14:18:22 +04:00
igor@olga.mysql.com
a5011de0a8 Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/mysql-5.1-opt-merge
 2007-06-04 03:16:17 -07:00
igor@olga.mysql.com
31c57a1efc Post-merge fix. 2007-06-04 03:03:15 -07:00
mhansson@dl145s.mysql.com
d9fcc304d9 Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  dl145s.mysql.com:/dev/shm/mhansson/my50-bug27741
 2007-06-04 09:26:54 +02:00
igor@olga.mysql.com
ca49b83d5a Merge olga.mysql.com:/home/igor/mysql-5.1 
into  olga.mysql.com:/home/igor/mysql-5.1-opt-merge
 2007-06-03 22:52:02 -07:00
mhansson@dl145s.mysql.com
358567dfab Merge bk-internal:/home/bk/mysql-5.1-opt 
into  dl145s.mysql.com:/dev/shm/mhansson/my51-bug27741-mpush
 2007-06-03 23:31:57 +02:00
evgen@moonbone.local
b642eb121f item_func.h, item_func.cc: 
Post merge fix for the bug#28494.
 2007-06-03 21:52:00 +04:00
igor@olga.mysql.com
44b46b73f2 Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug28728
 2007-06-03 07:58:07 -07:00
evgen@moonbone.local
6acad85a95 Merge moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql 
into  moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql
 2007-06-03 16:06:55 +04:00
evgen@moonbone.local
27d956b5e9 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql
 2007-06-03 16:00:04 +04:00
evgen@moonbone.local
88147d5cfe user_var.result: 
Corrected test case result for the bug#28494.
item_func.h, item_func.cc:
  Corrected function names after fix for the bug#28494.
 2007-06-03 15:56:48 +04:00
evgen@moonbone.local
5d695b777a Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql
 2007-06-03 14:46:37 +04:00
evgen@moonbone.local
7dbe9d3318 user_var.result, user_var.test: 
Extended test case for the bug#28494.
 2007-06-03 14:46:09 +04:00
igor@olga.mysql.com
cc0eff3e63 Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug28728
 2007-06-03 00:21:42 -07:00
gkodinov/kgeorge@macbook.gmz
8fd809bfd8 Merge bk-internal:/home/bk/mysql-5.0-opt 
into  macbook.gmz:/Users/kgeorge/mysql/work/B26162-5.0-opt
 2007-06-03 10:03:37 +03:00
gkodinov/kgeorge@macbook.gmz
9a1d8adc9d Bug #26162: Trigger DML ignores low_priority_updates setting 
The value of "low-priority-updates" option and the LOW PRIORITY
prefix was taken into account at parse time.
This caused triggers (among others) to ignore this flag (if
supplied for the DML statement).
Moved reading of the LOW_PRIORITY flag at run time.
Fixed an incosistency when handling
SET GLOBAL LOW_PRIORITY_UPDATES : now it is in effect for
delayed INSERTs.
Tested by checking the effect of LOW_PRIORITY flag via a 
trigger.
 2007-06-03 09:40:00 +03:00
evgen@moonbone.local
9967e513a5 Merge moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql 
into  moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql
 2007-06-03 09:17:31 +04:00
igor@olga.mysql.com
91da3132b5 Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug28728
 2007-06-02 14:37:42 -07:00
evgen@moonbone.local
f4e20490a4 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql
 2007-06-03 01:25:24 +04:00
evgen@moonbone.local
162a6b42ec item_func.cc: 
Post fix for bug#28494.
  The Item_func_set_user_var::check method now silently doesn't use result_field
  if it isn't defined.
 2007-06-03 01:24:56 +04:00
evgen@moonbone.local
400bfb92b8 Merge moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql 
into  moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql
 2007-06-02 23:49:52 +04:00
igor@olga.mysql.com
55fea25de4 Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug28728
 2007-06-02 12:46:48 -07:00
evgen@moonbone.local
294ead9ac9 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql
 2007-06-02 23:20:54 +04:00
evgen@moonbone.local
4934646764 Bug#28494: Grouping by Item_func_set_user_var produces incorrect result. 
This is an additional fix.
Item::val_xxx methods are supposed to use original data source and
Item::val_xxx_result methods to use the item's result field. But for the
Item_func_set_user_var class val_xxx_result methods were mapped to val_xxx
methods. This leads, in particular, to producing bad sort keys and thus
wrong order of the result set of queries with group by/order by clauses.

The set of val_xxx_result methods is added to the Item_func_set_user_var
class. It's the same as the val_xxx set of method but uses the result_field
to return a value.
 2007-06-02 23:17:46 +04:00
mats@kindahl-laptop.dnsalias.net
2bcbb7dafc BUG#28752 (binlog_format variable is empty when binlog is turned off): 
Setting MIXED format instead of UNSPECIFIED format when server is
started without log-bin.
 2007-06-02 21:01:30 +02:00
igor@olga.mysql.com
5cbebf0a18 Fixed bug #28728: a crash when executing EXPLAIN EXTENDED for a query 
using a derived table over a grouping subselect.

This crash happens only when materialization of the derived tables 
requires creation of auxiliary temporary table, for example when
a grouping operation is carried out with usage of a temporary table.

The crash happened because EXPLAIN EXTENDED when printing the query
expression made an attempt to use the objects created in the mem_root
of the temporary table which has been already freed by the moment
when printing is called.

This bug appeared after the method Item_field::print() had been 
introduced.
 2007-06-02 11:44:16 -07:00
sergefp@mysql.com
ad18c4b95c BUG#28427: fix typo, s/bool/uint/ 2007-06-02 21:43:04 +04:00
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
798b38a447 Merge dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0 
into  dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/tmp/merge_5.0
 2007-06-02 17:56:39 +03:00
igor@olga.mysql.com
5a5410e40e Post-merge fix. 2007-06-01 17:58:46 -07:00
ibabaev@bk-internal.mysql.com
4bc1738be0 Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-opt
 2007-06-02 00:57:25 +02:00
igor@olga.mysql.com
cf36fd1117 Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/mysql-5.1-opt
 2007-06-01 15:05:21 -07:00
evgen@moonbone.local
fc01b0995d Bug#28427: Columns were renamed instead of moving by ALTER TABLE. 
To avoid unnecessary work the mysql_alter_table function takes the
list of table fields and applies all changes to it (drops/moves/renames/etc).
Then this function compares the new list and the old one. If the changes
require only .frm to be modified then the actual data isn't copied. To detect
changes all columns attributes but names are compared. When a column has been
moved and has replaced another column with the same attributes except name
the mysql_alter_table function wrongly decides that two fields has been just
renamed. As a result the data from the moved column and from all columns
after it is not copied.

Now the mysql_alter_table function forces table data copying by setting
the need_copy_table flag when it finds a moved column. The flag is set at
the stage when the modified fields are created.
 2007-06-02 01:21:18 +04:00
kostja@bodhi.(none)
6044940b25 Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
 2007-06-01 20:06:13 +04:00