mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 06:44:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
45917 commits 2781 branches 343 tags 1.6 GiB
Commit graph

13951 commits

Author SHA1 Message Date
tsmith@quadxeon.mysql.com
6dbfd2156e Fix braindead bad merge of mysqldump test. 2007-05-01 06:29:34 +02:00
tsmith@quadxeon.mysql.com
f440e299e1 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-04-30 23:32:13 +02:00
tnurnberg@mysql.com/blasphemy.mysql.com
205dfa4401 Bug#27293: mysqldump crashes when dumping procedure defined by different user 
mysqldump didn't properly handle getting no data on
SHOW CREATE PROCEDURE.  If S/C/P fails (due to dumping
user's insufficient privileges on mysql.proc, say),
mysqldump will print a comment to that effect to the
output and return an error-code.  If the -f (force) option
is used, the dump will continue, otherwise, it will abort
right there and then.

Also fixes Bug#22761, "mysqldump reports no errors when using
--routines without mysql.proc privileges"
---
Merge mysql.com:/home/tnurnberg/27293/50-27293
into  mysql.com:/home/tnurnberg/27293/51-27293
---
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  mysql.com:/home/tnurnberg/27293/51-27293
 2007-04-30 12:32:57 +02:00
tnurnberg@mysql.com/blasphemy.mysql.com
ce1074f6fe Bug#27293: mysqldump crashes when dumping procedure defined by different user 
mysqldump didn't properly handle getting no data on
SHOW CREATE PROCEDURE.  If S/C/P fails (due to dumping
user's insufficient privileges on mysql.proc, say),
mysqldump will print a comment to that effect to the
output and return an error-code.  If the -f (force) option
is used, the dump will continue, otherwise, it will abort
right there and then.

Also fixes Bug#22761, "mysqldump reports no errors when using
--routines without mysql.proc privileges"
---
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/home/tnurnberg/27293/50-27293
 2007-04-30 11:30:07 +02:00
kaa@polly.local
561bd78654 Merge polly.local:/home/kaa/src/maint/bug24912/my50-bug24912 
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
 2007-04-28 20:26:14 +04:00
kaa@polly.local
83e8b70983 Merge polly.local:/home/kaa/src/maint/bug24912/my51-bug24912 
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
 2007-04-28 20:08:58 +04:00
kaa@polly.local
a45b654ed7 Merge polly.local:/home/kaa/src/maint/bug24912/my50-bug24912 
into  polly.local:/home/kaa/src/maint/bug24912/my51-bug24912
 2007-04-28 20:04:03 +04:00
kaa@polly.local
050c6723e8 Fix for bug #24912 "problems with bigint in abs() ceiling() round() truncate() mod()" and a number of related problems: 
- unsigned flag was not handled correctly for a number of mathematical funcions, which led to incorrect results
- passing large values as the number of decimals to ROUND() resulted in incorrect results and even server crashes in some cases
- reverted the fix and the testcase for bug #10083 as it violates the manual
- fixed some testcases which relied on broken ROUND() behavior
 2007-04-28 20:01:01 +04:00
tsmith@quadxeon.mysql.com
6348d0806c Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-04-28 01:50:16 +02:00
tsmith@quadxeon.mysql.com
acee0c8e20 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
 2007-04-28 01:48:59 +02:00
kaa@polly.local
e8917d0d0f Merge polly.local:/home/kaa/src/maint/bug22364/my51-bug22364 
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
 2007-04-27 13:06:24 +04:00
kaa@polly.local
d7d0337482 Merge polly.local:/home/kaa/src/maint/bug22364/my50-bug22364 
into  polly.local:/home/kaa/src/maint/bug22364/my51-bug22364
 2007-04-27 12:42:15 +04:00
svoj@april.(none)
640b3e4e74 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
 2007-04-27 01:33:16 +05:00
svoj@mysql.com/april.(none)
ce55046fbd Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
 2007-04-27 00:56:50 +05:00
kaa@polly.local
02f2616ee3 Merge polly.local:/home/kaa/src/maint/bug22364/my50-bug22364 
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
 2007-04-26 20:51:02 +04:00
joerg@trift-lap.fambruehe
2ed383302f Merge trift-lap.fambruehe:/MySQL/M50/mysql-5.0 
into  trift-lap.fambruehe:/MySQL/M50/push-5.0
 2007-04-26 16:06:44 +02:00
joerg@trift-lap.fambruehe
f723388b18 Merge trift-lap.fambruehe:/MySQL/M51/mysql-5.1 
into  trift-lap.fambruehe:/MySQL/M51/push-5.1
 2007-04-26 16:03:02 +02:00
msvensson@pilot.blaudden
6e4acae645 Merge pilot.blaudden:/home/msvensson/mysql/bug25262/my50-bug25262 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-25 12:08:39 +02:00
msvensson@pilot.blaudden
5fdd4112eb Merge pilot.blaudden:/home/msvensson/mysql/bug25262/my51-bug25262 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-25 11:13:41 +02:00
iggy@recycle.(none)
08ea692a7f - Resolved conflict between fixes for bugs 25141 and 26074. 
- Use the 25141 fix.
- 26074 is duplicate, as 25141 has more comprehensive test
 2007-04-24 16:07:52 -04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
49b187034d Merge mysql.com:/home/ram/work/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b27515/b27515.5.0
 2007-04-24 14:08:03 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
244c192347 after-merge fix 2007-04-24 13:53:12 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
d13861546e after-merge fix 2007-04-24 11:26:40 +05:00
iggy@recycle.(none)
e251139c80 Merge recycle.(none):/src/mysql-5.1-maint 
into  recycle.(none):/src/mysql-5.1-maint_25141
 2007-04-23 17:04:24 -04:00
iggy@recycle.(none)
2a54abd582 Bug#25141 Crash Server on Partitioning command 
- The function build_table_filename() builds up a string unconditionally 
using the forward slash as a path separator. Later, when the string is 
searched for FN_LIBCHAR by the set_up_table_before_create() function, a 
null pointer is returned that is finally used by strlen in the 
append_file_to_dir() function which causes the crash.
 2007-04-23 13:50:34 -04:00
msvensson@pilot.blaudden
2ac94c30f4 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-23 17:01:02 +02:00
kaa@polly.local
9a99aa8155 Fix for bug #22364 "Inconsistent "matched rows" when executing UPDATE" 
In multi_update::send_data(), the counter of matched rows was not correctly incremented, when during insertion of a new row to a temporay table it had to be converted from HEAP to MyISAM.

This fix changes the logic to increment the counter of matched rows in the following cases:
1. If the error returned from write_row() is zero.
2. If the error returned from write_row() is non-zero, is neither HA_ERR_FOUND_DUPP_KEY nor HA_ERR_FOUND_DUPP_UNIQUE, and a call to create_myisam_from_heap() succeeds.
 2007-04-23 18:22:33 +04:00
msvensson@pilot.blaudden
dcd914e24e Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-23 16:22:01 +02:00
msvensson@pilot.blaudden
b941ef8633 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-23 13:28:09 +02:00
msvensson@pilot.blaudden
b11a1c8fd4 Update test to work also when --pager does not exist in "mysql" 2007-04-23 12:58:35 +02:00
msvensson@pilot.blaudden
d1de41c59a Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-23 12:05:00 +02:00
msvensson@pilot.blaudden
a23eeb620c Remove left over file fix_priv_tabs.result 2007-04-23 11:41:55 +02:00
joerg@debian.(none)
9c04bfed83 Merge debian.(none):/M50/mysql-5.0 
into  debian.(none):/M50/push-5.0
 2007-04-23 11:31:11 +02:00
joerg@debian.(none)
94008df3e0 Merge debian.(none):/M51/mysql-5.1 
into  debian.(none):/M51/push-5.1
 2007-04-23 11:21:15 +02:00
mjorgensen@blade09.mysql.com
121bc31b4a Merge bk-internal:/home/bk/mysql-5.0 
into  blade09.mysql.com:/tmp/mmj/mysql-5.0-runtime
 2007-04-21 18:36:06 +02:00
mjorgensen@blade09.mysql.com
7855ae51f0 Merge bk-internal:/home/bk/mysql-5.1 
into  blade09.mysql.com:/tmp/mmj/mysql-5.1-runtime
 2007-04-21 18:35:01 +02:00
ibabaev@bk-internal.mysql.com
c22d6fbb2b Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
 2007-04-21 03:51:51 +02:00
igor@olga.mysql.com
8c85357ea3 Post-merge fix. 2007-04-20 17:47:14 -07:00
malff/marcsql@weblab.(none)
c574d95a5c manual merge 2007-04-20 17:49:07 -06:00
ibabaev@bk-internal.mysql.com
c09d1cfe92 Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-opt
 2007-04-21 00:36:21 +02:00
malff/marcsql@weblab.(none)
fc36313733 Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base 
into  weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge
 2007-04-20 15:34:04 -06:00
malff/marcsql@weblab.(none)
2d6d8e2abe Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base 
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge
 2007-04-20 15:31:41 -06:00
evgen@moonbone.local
4434ff13a9 Merge moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.0-opt 
into  moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.1-opt
 2007-04-21 00:33:56 +04:00
mats@romeo.(none)
f4c4de6a56 Added missing result file for rpl_critical_errors. 2007-04-20 14:08:12 +02:00
mats@romeo.(none)
ae9744f266 Adding missing result file for rpl_critical_errors. 2007-04-20 14:03:15 +02:00
gshchepa/uchum@gshchepa.loc
6c5d17ef56 Merge gshchepa.loc:/home/uchum/work/bk-trees/mysql-5.0-opt 
into  gshchepa.loc:/home/uchum/work/bk-trees/mysql-5.0-opt-27704
 2007-04-20 16:44:50 +05:00
gshchepa/uchum@gshchepa.loc
4fcf1316bb Merge gshchepa.loc:/home/uchum/work/bk-trees/mysql-4.1-opt-27704 
into  gshchepa.loc:/home/uchum/work/bk-trees/mysql-5.0-opt-27704
 2007-04-20 15:31:33 +05:00
joerg@debian.(none)
6ef12bb111 Merge debian.(none):/M50/mysql-5.0 
into  debian.(none):/M50/push-5.0
 2007-04-20 12:31:03 +02:00
gshchepa/uchum@gshchepa.loc
f5a229b3d1 Bug#27704: incorrect comparison of rows with NULL components 
Support for NULL components was incomplete for row comparison,
fixed.  Added support for abort_on_null at compare_row() like
in 5.x
 2007-04-20 15:14:09 +05:00
joerg@debian.(none)
4c00b6fd26 Merge debian.(none):/M51/mysql-5.1 
into  debian.(none):/M51/push-5.1
 2007-04-20 11:58:56 +02:00