database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-21 06:21:35 +03:00
Code Activity
57,505 Commits 3,280 Branches 1,098 Tags
b22d02ad42880f37a4fe896fc69a0a33798eaeda
Commit Graph

24084 Commits

Author SHA1 Message Date
igor@olga.mysql.com
ce9ee1b9f3 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/mysql-5.0-opt
 2007-07-21 15:46:02 -07:00
gshchepa/uchum@gleb.loc
58f0814c3b Merge gleb.loc:/home/uchum/work/bk/5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-07-22 01:58:37 +05:00
gshchepa/uchum@gleb.loc
882bb64fc6 Merge gleb.loc:/home/uchum/work/bk/5.0-opt-29338 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
 2007-07-22 01:52:13 +05:00
gshchepa/uchum@gleb.loc
872d21eb1f sp.test, sp.result: 
Additional test case fix for bug #29338.
 2007-07-22 01:49:41 +05:00
igor@olga.mysql.com
233d5523ae Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug29911
 2007-07-21 13:36:33 -07:00
gshchepa/uchum@gleb.loc
f7010479fb Merge gleb.loc:/home/uchum/work/bk/5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-07-22 00:53:01 +05:00
gshchepa/uchum@gleb.loc
2313bbc304 Merge gleb.loc:/home/uchum/work/bk/5.0-opt-29338 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
 2007-07-22 00:40:14 +05:00
igor@olga.mysql.com
43dab6b5de Merge olga.mysql.com:/home/igor/dev-opt/mysql-4.1-opt-bug29911 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug29911
 2007-07-21 12:34:18 -07:00
kostja@bodhi.(none)
0e728d1463 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
 2007-07-21 17:54:23 +04:00
kostja@bodhi.(none)
2ecd75ef24 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.(none):/opt/local/work/mysql-5.0-runtime
 2007-07-21 17:52:16 +04:00
igor@olga.mysql.com
07e0cd2f4e Fixed bug #29911. 
This bug manifested itself for join queries with GROUP BY and HAVING clauses
whose SELECT lists contained DISTINCT. It occurred when the optimizer could
deduce that the result set would have not more than one row.
The bug could lead to wrong result sets for queries of this type because
HAVING conditions were erroneously ignored in some cases in the function
remove_duplicates.
 2007-07-20 22:56:19 -07:00
istruewing@chilla.local
3a33c745f1 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-07-21 03:13:59 +02:00
istruewing@chilla.local
410e4400c4 Merge chilla.local:/home/mydev/mysql-5.1-amain 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-07-21 03:12:35 +02:00
istruewing@chilla.local
d9bd5f2364 Merge chilla.local:/home/mydev/mysql-5.1-ateam 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-07-21 03:10:23 +02:00
gshchepa/uchum@gleb.loc
a5075a68be Merge gleb.loc:/home/uchum/work/bk/5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-07-21 05:32:01 +05:00
gshchepa/uchum@gleb.loc
4990843b83 Merge gleb.loc:/home/uchum/work/bk/5.0-opt-29788 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
 2007-07-21 05:15:16 +05:00
kent@kent-amd64.(none)
9d247f296a Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/kent/bk/tmp3/mysql-5.0-build
 2007-07-21 01:53:19 +02:00
kent@kent-amd64.(none)
60b78f9f1a Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/kent/bk/tmp3/mysql-5.1-build
 2007-07-21 01:52:15 +02:00
gshchepa/uchum@gleb.loc
c3e925eec3 Fixed bug #29788. 
After dumping triggers mysqldump copied 
the value of the OLD_SQL_MODE variable to the SQL_MODE
variable. If the --compact option of the mysqldump was
not set the OLD_SQL_MODE variable had the value
of the uninitialized SQL_MODE variable. So
usually the NO_AUTO_VALUE_ON_ZERO option of the
SQL_MODE variable was discarded.

This fix is for non-"--compact" mode of the mysqldump,
because mysqldump --compact never set SQL_MODE to the
value of NO_AUTO_VALUE_ON_ZERO.

The dump_triggers_for_table function has been modified
to restore previous value of the SQL_MODE variable after
dumping triggers using the SAVE_SQL_MODE temporary
variable.
 2007-07-21 04:50:11 +05:00
istruewing@chilla.local
0a5d8f43b7 Merge chilla.local:/home/mydev/mysql-5.0-amain 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2007-07-21 01:34:55 +02:00
istruewing@chilla.local
4f60ac5242 Merge chilla.local:/home/mydev/mysql-5.0-ateam 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2007-07-21 01:33:25 +02:00
gshchepa/uchum@gleb.loc
27f11688da Merge gleb.loc:/home/uchum/work/bk/5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-07-21 02:25:39 +05:00
acurtis/antony@ltamd64.xiphis.org
3d7ce2ce9c Merge xiphis.org:/anubis/antony/work/mysql-5.1-engines 
into  xiphis.org:/anubis/antony/work/p1-bug29875.1
 2007-07-20 12:35:15 -07:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
395233b4f7 Bug#29875 
"Disable transaction support in Federated storage engine"
  Minimal patch to disable Federated's transactions until they can be fixed.
 2007-07-20 11:35:19 -07:00
gkodinov/kgeorge@magare.gmz
8fc401e21f Bug #28591: MySQL need not sort the records in case of 
ORDER BY primary_key on InnoDB table

Queries that use an InnoDB secondary index to retrieve
data don't need to sort in case of ORDER BY primary key
if the secondary index is compared to constant(s).
They can also skip sorting if ORDER BY contains both the
the secondary key parts and the primary key parts (in
that order).
This is because InnoDB returns the rows in order of the
primary key for rows with the same values of the secondary
key columns.
Fixed by preventing temp table sort for the qualifying 
queries.
 2007-07-20 21:05:29 +03:00
evgen@moonbone.local
e50e8c94fc Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/mnt/gentoo64/work/29898-bug-5.0-opt-mysql
 2007-07-20 22:05:20 +04:00
gni@dev3-221.dev.cn.tlan
2997e6f432 BUG#22240 Upgrading from cluster 5.0 to 5.1 does not resize VARCHARS as expected. 
add varchar type restoring test from 5.0 backup into 5.1
 2007-07-20 19:43:56 +08:00
gkodinov/kgeorge@magare.gmz
174dcb07ab Bug #29644: alter table hangs if records locked in share mode 
by long running transaction

On Windows opened files can't be deleted. There was a special
upgraded lock mode (TL_WRITE instead of TL_WRITE_ALLOW_READ) 
in ALTER TABLE to make sure nobody has the table opened
when deleting the old table in ALTER TABLE. This special mode
was causing ALTER TABLE to hang waiting on a lock inside InnoDB.
This special lock is no longer necessary as the server is 
closing the tables it needs to delete in ALTER TABLE.
Fixed by removing the special lock.
Note that this also reverses the fix for bug 17264 that deals with
another consequence of this special lock mode being used.
 2007-07-20 14:17:15 +03:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
4a2a13158e after-merge fixup 2007-07-20 15:37:42 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
6881c96eb3 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b28125/b28125.5.0
 2007-07-20 15:23:35 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
8e22343c58 after-merge fixup 2007-07-20 15:19:37 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
93f894903e Merge mysql.com:/home/ram/work/mysql-5.1-maint 
into  mysql.com:/home/ram/work/b28125/b28125.5.1
 2007-07-20 14:08:10 +05:00
svoj@mysql.com/june.mysql.com
2edad3d4ba BUG#28838 - duplicate external_lock in mysql_alter_table 
Fixed wrong test case. Added lost row that appeared after fix for
this bug.
 2007-07-20 13:27:12 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
7c156aa286 after-merge fixup. 2007-07-20 11:45:08 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
4a52b5c885 Fixed #29923: federated.test fails in 5.0-maint, 5.1-maint 
Result adjusted.
 2007-07-20 11:23:38 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
e6550a65f4 Merge mysql.com:/home/ram/work/b28125/b28125.5.0 
into  mysql.com:/home/ram/work/b28125/b28125.5.1
 2007-07-20 10:30:40 +05:00
gshchepa/uchum@gleb.loc
95d43074cc Merge gleb.loc:/home/uchum/work/bk/5.1 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-07-20 04:21:46 +05:00
gshchepa/uchum@gleb.loc
c06d233d4d Merge gleb.loc:/home/uchum/work/bk/5.0 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
 2007-07-20 04:15:50 +05:00
gshchepa/uchum@gleb.loc
c404cd7c9c Merge gleb.loc:/home/uchum/work/bk/5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-07-20 04:04:57 +05:00
dkatz@damien-katzs-computer.local
216c669b7e Merge damien-katzs-computer.local:/Users/dkatz/mysql51 
into  damien-katzs-computer.local:/Users/dkatz/51
 2007-07-19 17:03:50 -04:00
evgen@moonbone.local
08b9103d71 Bug#29898: Item_date_typecast::val_int doesn't reset the null_value flag. 
The Item_date_typecast::val_int function doesn't reset null_value flag.
This makes all values that follows the first null value to be treated as nulls
and led to a wrong result.

Now the Item_date_typecast::val_int function correctly sets the null_value flag
for both null and non-null values.
 2007-07-20 00:06:35 +04:00
cmiller@zippy.cornsilk.net
65c59c1d04 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26909/my51-bug26909 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2007-07-19 15:37:43 -04:00
cmiller@zippy.cornsilk.net
784dff6da3 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26909/my50-bug26909 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug26909/my51-bug26909
 2007-07-19 15:34:40 -04:00
cmiller@zippy.cornsilk.net
773861ded7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2007-07-19 15:33:27 -04:00
cmiller@zippy.cornsilk.net
e49d38a382 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26909/my50-bug26909 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2007-07-19 15:30:49 -04:00
dkatz@damien-katzs-computer.local
887a11071f Bug #29910 Sporadic test failure in status.test 2007-07-19 15:25:54 -04:00
joerg@trift2.
7c4f905d55 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-07-19 20:16:27 +02:00
joerg@trift2.
f2dee68c3d Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-07-19 20:04:35 +02:00
evgen@moonbone.local
7a2491871d Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/mnt/gentoo64/work/29850-bug-5.0-opt-mysql
 2007-07-19 21:40:12 +04:00
dkatz@damien-katzs-computer.local
d81c502b8f Merge damien-katzs-computer.local:/Users/dkatz/mysql50 
into  damien-katzs-computer.local:/Users/dkatz/mysql51
 2007-07-19 13:36:37 -04:00