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
35989 commits 2791 branches 343 tags 1.7 GiB
Commit graph

35989 commits

This branch
This branch
All branches
Author SHA1 Message Date
jani@a88-113-38-195.elisa-laajakaista.fi
68d795b0da Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/new/mysql-4.1-main
 2007-04-13 09:02:14 +03:00
bar@mysql.com
52f4b9343f Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 
into  mysql.com:/home/bar/mysql-5.0.b20095
 2007-04-13 10:06:50 +05:00
bar@mysql.com
be8fc46db6 Bug#20095 Changing length of VARCHAR field with UTF8 collation does not truncate values 
Problem: single byte do_varstring1() function was called, which didn't
check limit on "number of character", and checked only "number of bytes".
Fix: adding a multi-byte aware function do_varstring1_mb(),
to limit on "number of characters"
 2007-04-13 10:05:55 +05:00
tomas@whalegate.ndb.mysql.com
5d89ca3a89 Bug#27775 mediumint auto_increment with ndb_restore 
- autoincrement column of size medium int not handled in ndb_restore
- added testcase also for other types, tiny, small... etc
 2007-04-13 01:37:24 +02:00
gshchepa/uchum@gshchepa.localdomain
342a6c5866 Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  gshchepa.localdomain:/home/uchum/work/bk-trees/5507-ci
 2007-04-13 00:38:45 +05:00
tomas@whalegate.ndb.mysql.com
7fd59a08af Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-opt
 2007-04-12 21:38:44 +02:00
tomas@whalegate.ndb.mysql.com
3ff7444ac7 remove inline NdbRecAttr functions for medium int as not to depend in my_global 2007-04-12 21:34:25 +02:00
gshchepa/uchum@gshchepa.localdomain
4b2aab14ba Bug#5507: TRUNCATE does not work with views. 
Support of views wasn't implemented for the TRUNCATE statement.
Now TRUNCATE on views has the same semantics as DELETE FROM view:
mysql_truncate() checks whether the table is a view and falls back
to delete if so.
In order to initialize properly the LEX::updatable for a view
st_lex::can_use_merged() now allows usage of merged views for the
TRUNCATE statement.
 2007-04-12 23:21:37 +05:00
tomas@whalegate.ndb.mysql.com
0ddf40b025 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-opt 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-opt
 2007-04-12 19:49:46 +02:00
tomas@whalegate.ndb.mysql.com
8a98276ba7 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-opt
 2007-04-12 19:49:21 +02:00
joerg@trift2.
3050edc0b9 Merge trift2.:/MySQL/M41/push-4.1 
into  trift2.:/MySQL/M50/push-5.0
 2007-04-12 18:41:55 +02:00
tomas@whalegate.ndb.mysql.com
6015317269 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-opt
 2007-04-12 18:29:24 +02:00
mats@romeo.(none)
c2f20fa79e Merge romeo.(none):/home/bkroot/mysql-5.0-rpl 
into  romeo.(none):/home/bk/b26551-mysql-5.0-rpl
 2007-04-12 14:32:37 +02:00
mats@romeo.(none)
fd24cdf91c BUG#26551 (Aborted query for non-transactional table breaks replication): 
Added error code ER_QUERY_INTERRUPTED to the list of special errors
that prevent the slave from starting to execute a query.
 2007-04-12 14:00:45 +02:00
jani@ua141d10.elisa.omakaista.fi
335153121b Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-marvel
 2007-04-12 12:50:02 +03:00
tomas@whalegate.ndb.mysql.com
f9a900f80e Bug #27758 Restoring NDB backups makes table usable in SQL nodes 
- parse indexname using "split" instead of sscanf, as not to break at space
- test case with space in key
- enclose names in printout
 2007-04-12 11:07:30 +02:00
bar@mysql.com
e0cc5fd02c mysqld.cc: 
Removing wrong MYF(0) argument.
 2007-04-12 11:29:43 +05: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
tomas@whalegate.ndb.mysql.com
b86f256d24 remove warning 2007-04-11 20:22:31 +02:00
tomas@whalegate.ndb.mysql.com
3c0e6e3983 missing return 2007-04-11 19:29:32 +02:00
tomas@whalegate.ndb.mysql.com
06acade5c2 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-11 18:11:14 +02:00
tomas@whalegate.ndb.mysql.com
dd4351e96f Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11 
- try to catch as many malloc failures as possible and give error messages
 2007-04-11 15:21:11 +02:00
df@pippilotta.erinye.com
42499a4713 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
 2007-04-11 13:57:52 +02:00
df@pippilotta.erinye.com
f98d1614c3 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-25601 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
 2007-04-11 13:32:40 +02:00
df@pippilotta.erinye.com
b51c346781 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-36sp1 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
 2007-04-11 13:31:28 +02:00
df@pippilotta.erinye.com
d5f6363ba1 make configure handle service pack version strings 2007-04-11 13:01:11 +02:00
gkodinov/kgeorge@magare.gmz
4202454baa Bug #27530: 
The function CRC32() returns unsigned integer.
But the metadata (the unsigned flag) for the 
function was set incorrectly.
As a result type arithmetics based on the 
function's metadata (like finding the concise
type of an temporary table column to hold the result)
returned incorrect results.
Fixed by returning correct type information.

This fix is based on code contributed by Martin Friebe
(martin@hybyte.com) on 2007-03-30.
 2007-04-11 13:58:16 +03: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
jonas@perch.ndb.mysql.com
e0a4d1b4c7 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2007-04-11 08:28:09 +02:00
jonas@perch.ndb.mysql.com
d76e039ae7 Merge perch.ndb.mysql.com:/home/jonas/src/41-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
 2007-04-11 08:26:52 +02:00
jonas@perch.ndb.mysql.com
bb1adff862 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
 2007-04-11 08:26:23 +02:00
jonas@perch.ndb.mysql.com
4954962388 Merge perch.ndb.mysql.com:/home/jonas/src/41-work 
into  perch.ndb.mysql.com:/home/jonas/src/50-work
 2007-04-11 08:24:11 +02:00
jonas@perch.ndb.mysql.com
f52b0e3768 ndb - bug#27748 
fix commit trigger on multi-update
 2007-04-11 08:23:16 +02:00
kent@mysql.com/kent-amd64.(none)
c92faf9d61 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/kent/bk/tmp3/mysql-4.1-build
 2007-04-11 01:51:33 +02:00
kent@mysql.com/kent-amd64.(none)
7e02bed924 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/kent/bk/tmp3/mysql-5.0-build
 2007-04-11 01:50:58 +02:00
kent@mysql.com/kent-amd64.(none)
8bcdaa86cf my_memmem.c: 
Back port of include change and copyright from 5.1
Makefile.am, zlib.m4:
  Use separate libtool convenience library for the bundled
  zlib to embed into executables and shared libraries created,
  and one to install into the pkglib directory
 2007-04-11 01:47:42 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
904c75ede5 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
 2007-04-10 18:25:27 +02: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
jani@ua141d10.elisa.omakaista.fi
2ead71eebc Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-main
 2007-04-10 16:37:20 +03:00
serg@janus.mylan
102f58fe34 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-marvel 
into  janus.mylan:/usr/home/serg/Abk/mysql-5.0
 2007-04-10 15:27:26 +02:00
serg@janus.mylan
1c678b34aa Bug#27171 mysqlbinlog produces different output depends from option -R 
a better fix, that works with 4.1 servers which don't send a fake
Format_description_log_event.
 2007-04-10 15:26:35 +02: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
bar@mysql.com
11ccfd80e6 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 
into  mysql.com:/home/bar/mysql-5.0.b22648
 2007-04-09 17:59:42 +05:00
bar@mysql.com
4341df8cf6 Bug#22648 LC_TIME_NAMES: Setting GLOBAL has no effect 
Problem: setting/displaying @@LC_TIME_NAMES didn't distinguish between
GLOBAL and SESSION variable types - always SESSION variable
was set/shonw.
Fix: set either global or session value.
Also, "mysqld --lc-time-names" was added to set "global default" value.
 2007-04-09 17:58:56 +05:00