mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 14:54:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
36174 commits 2785 branches 343 tags 1.6 GiB
Commit graph

36174 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
edf6b73302 Avoid compiler warnings in Windows builds introduced by the patch for bug #24912 "problems with bigint in abs() ceiling() ruond() truncate() mod()" 2007-04-28 23:25:31 +04: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
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
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
tsmith@quadxeon.mysql.com
df2d9ca90a Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
 2007-04-28 01:40:06 +02:00
tsmith@quadxeon.mysql.com
33a74e41fc Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/b27653/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
 2007-04-28 01:31:15 +02:00
tsmith@quadxeon.mysql.com
b90b0c7eb2 Bug #27390: mysqld_multi --config-file= not working as documented 
Recognize the --no-defaults, --defaults-file and --defaults-extra-file
options.  Treat old --config-file argument as if --defaults-extra-file
had been specified instead.

Plus a few other defaults-related cleanups.
 2007-04-28 01:27:54 +02:00
kaa@polly.local
01b20b95e1 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
 2007-04-27 15:51:16 +04:00
tsmith@quadxeon.mysql.com
70a742f817 mysql_install_db.sh: Fix algorithm for finding pkgdata directory 2007-04-27 00:35:09 +02:00
tsmith@quadxeon.mysql.com
abcb45d21f Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/b27390/50
 2007-04-26 23:01:04 +02:00
svoj@mysql.com/april.(none)
29d2d5dccb 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-04-27 00:58:59 +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
svoj@mysql.com/april.(none)
f698977298 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-build 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines
 2007-04-27 00:32:51 +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
03f4492b5b Merge trift-lap.fambruehe:/MySQL/M50/clone-5.0 
into  trift-lap.fambruehe:/MySQL/M50/push-5.0
 2007-04-26 16:48:53 +02:00
joerg@trift-lap.fambruehe
5af470eef5 Merge trift-lap.fambruehe:/MySQL/M41/push-4.1 
into  trift-lap.fambruehe:/MySQL/M50/push-5.0
 2007-04-26 16:13:32 +02:00
joerg@trift-lap.fambruehe
69d39592b9 Merge trift-lap.fambruehe:/MySQL/M41/mysql-4.1 
into  trift-lap.fambruehe:/MySQL/M41/push-4.1
 2007-04-26 16:09:19 +02: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
msvensson@pilot.blaudden
27418637d7 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-26 13:58:33 +02:00
df@pippilotta.erinye.com
e0f148d5f0 Fix test case that was broken for builds without InnoDB. 2007-04-25 20:23:19 +02:00
tsmith@quadxeon.mysql.com
9e4cc9e393 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
 2007-04-25 20:23:05 +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
tsmith@quadxeon.mysql.com
4d34614389 mysql_install_db.sh: 
Disable broken quoting of extra arguments; proper fix requires using eval and lots more quoting throughout the script
 2007-04-25 09:16:38 +02:00
df@pippilotta.erinye.com
5ac0fc32b1 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-04-24 22:37:33 +02:00
df@pippilotta.erinye.com
adf575951b restrict recently added file to GPLv2 2007-04-24 22:33:25 +02:00
msvensson@pilot.blaudden
9bd17ef189 Merge pilot.blaudden:/home/msvensson/mysql/bug25118/my50-bug25118 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-24 13:59:44 +02:00
msvensson@pilot.blaudden
88ad41e256 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-24 13:06:58 +02:00
df@pippilotta.erinye.com
6e1a6c73d9 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-24 11:48:23 +02:00
df@pippilotta.erinye.com
211ddd4bdf Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-04-24 11:46:37 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
1d0f9bed85 Merge mysql.com:/home/ram/work/mysql-4.1-maint 
into  mysql.com:/home/ram/work/b27515/b27515.4.1
 2007-04-24 14:33:15 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
250ae972e7 Merge mysql.com:/home/ram/work/mysql-4.1-maint 
into  mysql.com:/home/ram/work/b27515/b27515.4.1
 2007-04-24 14:20:28 +05:00
msvensson@pilot.blaudden
ffd0d33fd2 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-24 11:18:52 +02:00
msvensson@pilot.blaudden
f028e17ab7 Merge pilot.blaudden:/home/msvensson/mysql/bug14862/my50-bug14862 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-24 11:16:56 +02: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
d13861546e after-merge fix 2007-04-24 11:26:40 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
bb3b6ae72c Merge mysql.com:/home/ram/work/b27515/b27515.4.1 
into  mysql.com:/home/ram/work/b27515/b27515.5.0
 2007-04-24 10:27:59 +05:00
iggy@recycle.(none)
45400e5ca3 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  recycle.(none):/src/bug24732/my50-bug24732
 2007-04-23 21:49:26 -04:00
iggy@recycle.(none)
5cf930719f Bug#24732 Executables do not include Vista manifests 
- Correct PushBuild failure.
 2007-04-23 21:43:36 -04:00
iggy@recycle.(none)
4a50d613df Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  recycle.(none):/src/bug24732/my50-bug24732
 2007-04-23 16:36:40 -04:00
iggy@recycle.(none)
7a358c4b5c Bug#24732 Executables do not include Vista manifests 
- Added script to generate application specific manifest.
- Added new CMake MACRO to add customer build events which will first
generate a manifest and then embeds that manifest into an executable.
 2007-04-23 15:41:24 -04:00
tsmith@quadxeon.mysql.com
12147d9553 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/41 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41
 2007-04-23 21:36:46 +02:00
tsmith@quadxeon.mysql.com
53985105f9 mysql_upgrade.test: 
Fix minor merge "oopsie"
 2007-04-23 21:27:43 +02:00
iggy@recycle.(none)
193e154ed4 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  recycle.(none):/src/bug25621/my50-bug25621
 2007-04-23 14:38:43 -04:00
iggy@recycle.(none)
30d6cf311a Bug#25621 Error in my_thread_global_end(): 1 threads didn't exit 
- On Windows, connection handlers while exiting properly did not 
decrement the server's thread count.
 2007-04-23 14:28:33 -04:00
joerg@debian.(none)
fd409818f6 Merge debian.(none):/M41/push-4.1 
into  debian.(none):/M50/push-5.0
 2007-04-23 18:46:10 +02:00
joerg@debian.(none)
6ffe87d02c Merge debian.(none):/M50/bug14685-5.0 
into  debian.(none):/M50/push-5.0
 2007-04-23 18:19:03 +02:00
msvensson@pilot.blaudden
4a1fd222ce Don't copy any subdirs in scripts/ 2007-04-23 18:16:57 +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