mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
46731 commits 2784 branches 343 tags 1.6 GiB
Commit graph

46731 commits

This branch
This branch
All branches
Author SHA1 Message Date
sergefp@mysql.com
ddc5957eeb Added comment for ha_statistics::records 2007-05-29 21:31:45 +04:00
gkodinov/kgeorge@magare.gmz
5c785a3690 Merge bk-internal:/home/bk/mysql-5.1-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/join_cache_explain-5.1-opt
 2007-05-29 19:19:41 +03:00
gkodinov/kgeorge@macbook.gmz
fe03f6bbe0 Bug #27531: 5.1 part of the fix 
- Renamed "Using join cache" to "Using join buffer".
- "Using join buffer" is now printed on the last
  table that "reads" from the join buffer cache.
 2007-05-29 15:58:18 +03:00
mhansson@dl145s.mysql.com
b227fc3343 Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  dl145s.mysql.com:/users/mhansson/mysql/autopush/my51-bug23856
 2007-05-29 14:14:11 +02:00
igor@olga.mysql.com
ad5dede765 Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/mysql-5.1-opt
 2007-05-27 21:33:20 -07:00
ibabaev@bk-internal.mysql.com
faf19f9d60 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
 2007-05-28 06:25:03 +02:00
igor@olga.mysql.com
48fe280271 Post-merge fix. 2007-05-27 20:14:50 -07:00
ibabaev@bk-internal.mysql.com
040e46fc1c Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-opt
 2007-05-28 00:05:38 +02:00
gshchepa/uchum@gleb.loc
ae0ab3ae6f view.result, mysqldump.result: 
Merge with 5.0-opt.
 2007-05-28 01:08:35 +05:00
gshchepa/uchum@gleb.loc
fae737b426 Merge gleb.loc:/home/uchum/work/bk/mysql-5.0-opt 
into  gleb.loc:/home/uchum/work/bk/mysql-5.1-opt
 2007-05-28 00:22:44 +05:00
igor@olga.mysql.com
bed482c2f9 Avoided warnings on Windows. 2007-05-26 13:19:36 -07:00
igor@olga.mysql.com
7ebff7d9a2 Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug28571
 2007-05-26 11:30:23 -07:00
igor@olga.mysql.com
fbebb47efe Fixed bug #28571. Outer join queries with ON conditions over 
constant outer tables did not return null complemented
rows when conditions were evaluated to FALSE.
Wrong results were returned because the conditions over constant
outer tables, when being pushed down, were erroneously enclosed 
into the guard function used for WHERE conditions.
 2007-05-26 10:33:01 -07:00
gshchepa/uchum@gleb.loc
1f0e116cf9 field.h: 
Warnings elimination.
 2007-05-26 00:44:13 +05:00
gshchepa/uchum@gleb.loc
dc32ee5347 Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  gleb.loc:/home/uchum/work/bk/mysql-5.0-opt
 2007-05-25 21:27:34 +05:00
gshchepa/uchum@gleb.loc
2ee30b0b7f Fixed bug #28522: 
sometimes `mysqldump --hex-blob' overruned output buffer by '\0' byte.

The dump_table() function has been fixed to reserve 1 byte more for the
last '\0' byte of dumped string.
 2007-05-25 17:24:17 +05:00
igor@olga.mysql.com
17a210e6b5 Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug28561
 2007-05-24 16:16:19 -07:00
jbruehe/mysqldev@mysql.com/production.mysql.com
7034295f79 Raise version number after cloning 5.1.19-beta 2007-05-24 17:35:22 +02:00
joerg@trift2.
db9128f84f Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  trift2.:/MySQL/M51/push-5.1
 2007-05-24 15:32:14 +02:00
joerg@trift2.
8592dfd90d Makefile.am : Add "embedded" tests to the "test-bt" target. 2007-05-24 15:20:06 +02:00
df@pippilotta.erinye.com
a390ac46a9 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-05-24 09:29:12 +02:00
df@pippilotta.erinye.com
2120cb89e0 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-05-24 09:28:30 +02:00
df@pippilotta.erinye.com
d542298098 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-05-24 09:27:53 +02:00
df@pippilotta.erinye.com
7459b4fca5 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-05-24 09:26:05 +02:00
df@pippilotta.erinye.com
d29eaed81a Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-05-24 09:22:00 +02:00
df@pippilotta.erinye.com
918d90d516 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-05-24 09:12:29 +02:00
igor@olga.mysql.com
428d2b6547 Fixed bug #28561: assertion abort for update on multi-table view with 
CHECK OPTION and a subquery in WHERE condition.
The abort was triggered by setting the value of join->tables for
subqueries in the function JOIN::cleanup. This function was called
after an invocation of the JOIN::join_free method for subqueries
used in WHERE condition.
 2007-05-23 19:04:12 -07:00
evgen@moonbone.local
559063177f Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/mnt/gentoo64/work/27563-bug-5.0-opt-mysql
 2007-05-23 23:31:33 +04:00
evgen@moonbone.local
d1d58b5f1d Bug#27563: Stored functions and triggers wasn't throwing an error when killed. 
If a stored function or a trigger was killed it had aborted but no error
was thrown. This allows the caller statement to continue without a notice.
This may lead to a wrong data being inserted/updated to/deleted as in such
cases the correct result of a stored function isn't guaranteed. In the case
of triggers it allows the caller statement to ignore kill signal and to
waste time because of re-evaluation of triggers that always will fail
because thd->killed flag is still on.

Now the Item_func_sp::execute() and the sp_head::execute_trigger() functions
check whether a function or a trigger were killed during execution and
throws an appropriate error if so.
Now the fill_record() function stops filling record if an error was reported
through thd->net.report_error.
 2007-05-23 23:24:16 +04:00
evgen@moonbone.local
c65b50378a sql_table.cc: 
After merge fix.
 2007-05-23 15:45:37 +04:00
mhansson@dl145s.mysql.com
d503391497 Merge dl145s.mysql.com:/users/mhansson/mysql/push/bug23856/my50-bug23856 
into  dl145s.mysql.com:/users/mhansson/mysql/push/bug23856/my51-bug23856
 2007-05-23 12:03:43 +02:00
joerg@trift2.
fb47cb1c82 Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-05-23 12:02:48 +02:00
mhansson@dl145s.mysql.com
7db4df0b3c Bug #23856: GROUP_CONCAT and ORDER BY: junk from previous 
rows for query on I_S

This is a patch to get rid of some warnings about comparisons
between singed and unsigned ints, which turn up on sapsrv1 and
sapsrv2.
 2007-05-23 12:00:18 +02:00
evgen@moonbone.local
349f1023bf Merge moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.0-opt 
into  moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql
 2007-05-23 13:46:10 +04:00
df@pippilotta.erinye.com
77e1e678d3 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-05-23 10:51:27 +02:00
df@pippilotta.erinye.com
a70903b7f8 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0.42 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-05-23 10:49:26 +02:00
svoj@june.mysql.com
64d34f6e22 Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
 2007-05-23 12:42:17 +05:00
svoj@june.mysql.com
442969fd16 Merge mysql.com:/home/svoj/devel/bk/mysql-5.1 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
 2007-05-23 12:41:30 +05:00
svoj@june.mysql.com
43b2dc188f Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
 2007-05-23 12:40:12 +05:00
svoj@mysql.com/june.mysql.com
122167bb4b Merge mysql.com:/home/svoj/devel/bk/mysql-5.0 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
 2007-05-23 12:39:33 +05:00
svoj@mysql.com/june.mysql.com
a4ddc22621 Merge mysql.com:/home/svoj/devel/bk/mysql-4.1 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines
 2007-05-23 12:38:34 +05:00
df@pippilotta.erinye.com
f8433465a2 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-05-23 08:40:39 +02:00
tomas@whalegate.ndb.mysql.com
2ff938d21c Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-05-22 23:28:19 +02:00
tomas@whalegate.ndb.mysql.com
b789452743 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-05-22 23:21:55 +02:00
tomas@whalegate.ndb.mysql.com
a4934466c0 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-05-22 23:21:32 +02:00
tomas@whalegate.ndb.mysql.com
481b314e9a Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-05-22 23:20:40 +02:00
tomas@whalegate.ndb.mysql.com
7b2c430f58 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
 2007-05-22 23:19:45 +02:00
joerg@trift2.
b8e3fb1333 Merge trift2.:/MySQL/M50/bug26609-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-05-22 20:02:23 +02:00
mhansson@dl145s.mysql.com
debb054d4a Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  dl145s.mysql.com:/users/mhansson/mysql/autopush/mysql-5.0o-pushee
 2007-05-22 18:30:23 +02:00
tomas@whalegate.ndb.mysql.com
2c715f1ad4 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-05-22 17:57:48 +02:00