mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 12:01:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
46096 commits 2793 branches 343 tags 1.5 GiB
Commit graph

46096 commits

This branch
This branch
All branches
Author SHA1 Message Date
omer@linux.site
56d180e83f Updated funcs_1 files to 5.1.18 level 
- validating current result files
 - updating with new features in information_schema / error messages
 - forced order by and removed time stamps
removed a_version files that are not needed (now that the suite is in the main tree
Note: datadict tests still fail as a result of bug 28181 (a regression introduced in 
      5.0.42 - and 5.1.18(?) - tests should runn clean once it is fixed
 2007-05-02 17:30:23 -07:00
omer@linux.site
46b5036f1b Merge linux.site:/home/omer/source/bld50_tmp 
into  linux.site:/home/omer/source/bld51_2
 2007-05-02 12:30:35 -07:00
df@pippilotta.erinye.com
1b26de73d5 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-02 19:25:14 +02:00
df@pippilotta.erinye.com
39e98943f9 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-05-02 19:21:50 +02:00
df@pippilotta.erinye.com
5d97bc653e 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-02 19:21:12 +02:00
df@pippilotta.erinye.com
765b6f5572 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-cmake-map-files 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-05-02 19:19:46 +02:00
df@pippilotta.erinye.com
45df7b36b2 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-cmake-map-files 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
 2007-05-02 19:16:35 +02:00
joerg@trift2.
2df354dcbe Merge trift2.:/MySQL/M51/spec-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-05-02 17:41:15 +02:00
joerg@trift2.
489da2252c Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-05-02 17:19:30 +02:00
joerg@trift2.
0db7e9c4f1 Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-05-02 17:15:48 +02:00
joerg@trift2.
11484e3319 "ndb_size.tmpl" is gone (NDB change 2007-04-24), so remove it from the spec file. 2007-05-02 17:10:41 +02:00
joerg@trift2.
8a08eec81a Merge trift2.:/MySQL/M50/spec-5.0 
into  trift2.:/MySQL/M51/spec-5.1
 2007-05-02 16:57:58 +02:00
joerg@trift2.
fc8b2783f0 Merge trift2.:/MySQL/M41/spec-4.1 
into  trift2.:/MySQL/M50/spec-5.0
 2007-05-02 16:53:54 +02:00
joerg@trift2.
f32c261973 RPM spec file error: Trailing '*' to cover '.gz' for a man page was missing. 2007-05-02 16:51:15 +02:00
omer@linux.site
4dac41dcad Coeection to the bug format to for better search - review comment 2007-05-02 07:50:47 -07:00
df@pippilotta.erinye.com
971992ea9a generate map files on windows 2007-05-02 15:50:08 +02:00
joerg@trift2.
6ee2fa0ff5 Manual merge: Makefile lines must start with tab, not blank. 2007-05-02 14:16:21 +02:00
joerg@trift2.
f486530d2d Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M51/mysql-5.1
 2007-05-02 14:08:43 +02:00
joerg@trift2.
bb2996f487 Format corrections for various "Makefile.am": Leading tab, no trailing blank. 2007-05-02 14:01:49 +02:00
tsmith@quadxeon.mysql.com
b4b44b0b6b Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-05-01 20:07:37 +02:00
tsmith@quadxeon.mysql.com
fc7fea0cc3 mysql-test-run.pl: 
Run master init scripts also for --embedded-server
 2007-05-01 20:05:09 +02:00
tsmith@quadxeon.mysql.com
b0007916c2 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-05-01 18:13:29 +02:00
tsmith@quadxeon.mysql.com
90468a7274 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
 2007-05-01 18:12:04 +02:00
omer@linux.site
d276ff0cf6 Updates to test/result files of funcs_1 to 5.0.40 level, 
- validated current result files
 - forced order by and removed time stamps 
removed a_version files (since do not make sense now when suite is in the main tree)
Note: datadict tests still fail as a result of regression bug 28181 in 5.0.42 (discovered
      while performing this update) - tests should run clean once bug is fixed
 2007-05-01 06:52:23 -07:00
tomas@whalegate.ndb.mysql.com
2a4a7ffde2 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-05-01 13:24:30 +02:00
tsmith@quadxeon.mysql.com
1462967aba Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-05-01 12:42:22 +02:00
tsmith@quadxeon.mysql.com
91a5830729 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
 2007-05-01 12:40:43 +02:00
holyfoot/hf@hfmain.(none)
53cdf37af1 Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt 
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
 2007-05-01 13:38:59 +05:00
tsmith@quadxeon.mysql.com
13cfd9471d Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-05-01 10:38:19 +02:00
tsmith@quadxeon.mysql.com
9aad848a86 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-05-01 06:30:48 +02:00
tsmith@quadxeon.mysql.com
6dbfd2156e Fix braindead bad merge of mysqldump test. 2007-05-01 06:29:34 +02:00
dkatz@damien-katzs-computer.local
73fe16cbfd Merge dkatz@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  damien-katzs-computer.local:/Users/dkatz/mysql50
 2007-04-30 17:51:57 -04:00
dkatz@damien-katzs-computer.local
33f8677d88 Merge damien-katzs-computer.local:/Users/dkatz/mysql50 
into  damien-katzs-computer.local:/Users/dkatz/mysql51
 2007-04-30 17:47:58 -04:00
tsmith@quadxeon.mysql.com
e267f900a2 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-30 23:33:32 +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
tsmith@quadxeon.mysql.com
44af4144e6 Bug #27653: Temp table can't be created if lower_case_table_names=1 and 
tmpdir has uppercase

Fix: don't convert mysql_tmpdir to lower case when building the path to a
temporary table
 2007-04-30 23:16:46 +02:00
dkatz@damien-katzs-computer.local
b578abc0c1 Merge damien-katzs-computer.local:/Users/dkatz/mysql50 
into  damien-katzs-computer.local:/Users/dkatz/50_frm_files
 2007-04-30 17:04:14 -04:00
joerg@trift2.
5ab7eb6a69 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  trift2.:/MySQL/M51/netware-cross-5.1
 2007-04-30 20:39:37 +02:00
joerg@trift2.
331902b792 Merge trift2.:/MySQL/M50/netware-cross-5.0 
into  trift2.:/MySQL/M51/netware-cross-5.1
 2007-04-30 20:29:57 +02:00
joerg@trift2.
8b0f68331b Necessary change for cross-builds: Include "mysql_fix_privilege_tables_sql.c" in the source tarball. 2007-04-30 17:01:00 +02:00
tomas@whalegate.ndb.mysql.com
1e06586c90 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-04-30 16:31:08 +02:00
tomas@whalegate.ndb.mysql.com
dd58f5a461 shorten filenames 2007-04-30 16:24:13 +02:00
jonas@perch.ndb.mysql.com
15cfd0fd03 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-04-30 13:00:36 +02:00
tnurnberg@maint1.mysql.com
4f321a0964 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  maint1.mysql.com:/data/localhome/tnurnberg/51-27293
 2007-04-30 12:57:24 +02:00
jonas@perch.ndb.mysql.com
5db64df3dc Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-04-30 12:57:20 +02:00
jonas@perch.ndb.mysql.com
6559c77022 ndb - bug#28161 
fix commit triggers with DD but not using DD
 2007-04-30 12:56:16 +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@maint1.mysql.com
a22ae7362f Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  maint1.mysql.com:/data/localhome/tnurnberg/50-27293
 2007-04-30 11:46:22 +02:00
tomas@whalegate.ndb.mysql.com
598a60285f ndb_restore to set correct value force varpart 
+ some tests
 2007-04-30 11:43:50 +02:00
kaa@polly.local
4b5079fe99 Merge polly.local:/home/kaa/src/maint/mysql-5.0-maint 
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
 2007-04-30 13:33:13 +04:00