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

36273 commits

This branch
This branch
All branches
Author SHA1 Message Date
msvensson@pilot.blaudden
c3f407a07a Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-05-18 12:56:52 +02:00
msvensson@pilot.blaudden
e05aa94353 WL#2247 mysqltest: add option for sorting results 
- Final touchups
 2007-05-18 12:50:23 +02:00
msvensson@pilot.blaudden
4998976d22 Bug#28473 Does mysql-test-run.pl handle LD_LIBRARY_PATH wrong ? 
- Fix spelling error
 2007-05-16 17:51:28 +02:00
msvensson@pilot.blaudden
d5676f2feb WL#2247 mysqltest: add option for sorting results 
- Change from "query_sorted <query>" to "sorted_results"
 2007-05-16 17:19:36 +02:00
msvensson@pilot.blaudden
4fed3bd425 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-05-16 16:31:05 +02:00
msvensson@pilot.blaudden
8e9149ea11 Bug#28470 mysqltest scripts need to know protocol 2007-05-16 16:30:26 +02:00
msvensson@pilot.blaudden
290b975043 Bug#21103: "DATE column not compared as DATE" 
BDB results fixed (not p/o 5.1 fix)
 2007-05-16 14:00:47 +02:00
msvensson@pilot.blaudden
3d723860c7 Merge pilot.blaudden:/home/msvensson/mysql/bk_fix/mysql-5.0-maint-patch4 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-05-16 12:49:15 +02:00
msvensson@pilot.blaudden
a65d12a830 Backport of TIME->MYSQL_TIME / Y2K fixset 
Made year 2000 handling more uniform
Removed year 2000 handling out from calc_days()
The above removes some bugs in date/datetimes with year between 0 and 200
Now we get a note when we insert a datetime value into a date column
For default values to CREATE, don't give errors for warning level NOTE
Fixed some compiler failures
Added library ws2_32 for windows compilation (needed if we want to compile with IOCP support)
Removed duplicate typedef TIME and replaced it with MYSQL_TIME

Better (more complete) fix for: Bug#21103 "DATE column not compared as DATE"
Fixed properly Bug#18997 "DATE_ADD and DATE_SUB perform year2K autoconversion magic on 4-digit year value"
Fixed Bug#23093 "Implicit conversion of 9912101 to date does not match cast(9912101 as date)"
 2007-05-16 10:44:59 +02:00
msvensson@pilot.blaudden
ab61cfcb2c Merge pilot.blaudden:/home/msvensson/mysql/bk_fix/mysql-5.0-maint-patch3 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-05-16 10:17:26 +02:00
msvensson@pilot.blaudden
19618b5375 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-05-16 10:15:21 +02:00
msvensson@pilot.blaudden
e888128e88 Bug#28223: mysqldump --compact --routines restores from @OLD_SQL_MODE w/o ever setting it 
- mysqldump generated output that set OLD_SQL_MODE twice, to different values
    (for triggers), or not at all (for routines) in some cases.
 2007-05-16 10:14:29 +02:00
msvensson@pilot.blaudden
47d3829f0b Fix for bug #28240: "isinf()" cannot be used in C++ for lack of prototype 
- Since isinf() portability across various platforms and
  compilers is a complicated question, we should not use
  it directly. Instead, the my_isinf() macro should be used,
  which is defined as an alias to the system-defined isinf()
  if it is safe to use, or a workaround implementation otherwise
 2007-05-16 10:10:02 +02:00
iggy@amd64.(none)
1a2e798a70 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  amd64.(none):/src/bug24732/my50-bug24732
 2007-05-15 15:23:40 -04:00
msvensson@pilot.blaudden
a0b1e5406d Add triggers for detecting bad changesets to mysql-5.0 2007-05-15 17:04:31 +02:00
iggy@amd64.(none)
3f4138a519 Bug#24732 Executables do not include Vista manifests 
- Manifest requires four part application version.
- mysqld does not need requireAdministrator rights 
to run.
 2007-05-15 10:30:11 -04:00
msvensson@pilot.blaudden
da8a944dfb Bug#27344 Total failure to start the server 
- Give some more protection against "too long socket name by setting the max
   length when to use a tmpdir for sockets to 70
 2007-05-15 16:03:38 +02:00
msvensson@pilot.blaudden
f924d84c91 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-05-10 13:28:48 +02:00
msvensson@pilot.blaudden
b805507358 Bug#27344 Total failure to start the server 
- Give some more protection against "too long socket name by setting the max
length when to use a tmpdir for sockets to 70
 2007-05-10 13:28:24 +02:00
msvensson@pilot.blaudden
d424941b4a Merge pilot.blaudden:/home/msvensson/mysql/bug28193/my50-bug28193 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-05-09 10:55:09 +02:00
msvensson@pilot.blaudden
9242d395cd Bug#28193 outfile fails randomly in pushbuild 
- Change testcase to use remove_file
 2007-05-09 10:52:28 +02:00
msvensson@pilot.blaudden
4f5ca432db Merge pilot.blaudden:/home/msvensson/mysql/bug28193/my41-bug28193 
into  pilot.blaudden:/home/msvensson/mysql/bug28193/my50-bug28193
 2007-05-09 10:50:37 +02:00
msvensson@pilot.blaudden
eeccd0de97 Merge pilot.blaudden:/home/msvensson/mysql/bug28193/my41-bug28193 
into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
 2007-05-09 10:49:52 +02:00
msvensson@pilot.blaudden
6c0f90e921 Bug #28193 outfile fails randomly in pushbuild 
- Change "exec rm" to "remove_file"
 2007-05-09 10:49:11 +02:00
msvensson@pilot.blaudden
548240a73d Merge bk-internal:/home/bk/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
 2007-05-09 10:48:45 +02:00
cmiller@zippy.cornsilk.net
24a04cee4a Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug27976/my50-bug27976 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2007-05-07 12:45:39 -04:00
cmiller@zippy.cornsilk.net
550ed5f312 Fix new error message list in v5. 2007-05-07 12:38:43 -04:00
cmiller@zippy.cornsilk.net
75802339b2 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug27976/my41-bug27976 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
 2007-05-07 11:09:44 -04:00
cmiller@zippy.cornsilk.net
98c14490f8 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug27976/my50-bug27976 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2007-05-07 11:03:53 -04:00
cmiller@zippy.cornsilk.net
5f895fef79 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug27976/my41-bug27976 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug27976/my50-bug27976
 2007-05-04 19:04:09 -04:00
cmiller@zippy.cornsilk.net
b6502ddb19 Bug #27976: Misleading error message, 'Sort buffer to small' 
The message is gramatically wrong, and factually wrong.

Change it to refer to the myisam_sort_buffer_size variable and change
"to" to "too".
 2007-05-04 17:38:29 -04:00
cmiller@zippy.cornsilk.net
881c0aab23 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug27173/my41-bug27173 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug27173/my50-bug27173
 2007-05-04 13:27:33 -04:00
cmiller@zippy.cornsilk.net
e5ee6a74ff Bug #27173: "Enabling keys got errno ..." does not say which table 
Warnings may show up in the error log that complain about a table, yet
don't tell us which table.

Add the database and table names to the message.
 2007-05-04 13:17:07 -04:00
iggy@recycle.(none)
f4f9480785 Minor fix. 2007-05-02 12:41:36 -04:00
msvensson@pilot.blaudden
1675d6f41a Bug#27994 Expose counter for stored procedure calls in Com_% status 
- Expose the already existing counter for number of stored procedure calls
 2007-05-02 14:25:11 +02:00
msvensson@pilot.blaudden
aea65eab78 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-05-02 11:16:41 +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
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
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
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
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
msvensson@pilot.blaudden
a1ba53df26 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-30 18:14:08 +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
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
igor@olga.mysql.com
2cf753a1e8 Post-merge fix. 2007-04-29 20:14:35 -07:00
igor@olga.mysql.com
f9ac5b43cc Merge olga.mysql.com:/home/igor/mysql-4.1-opt 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug24856
 2007-04-29 18:32:59 -07:00
igor@olga.mysql.com
395d8751d5 Fix in comments. 2007-04-29 18:28:58 -07:00
igor@olga.mysql.com
ce0be732d0 Fixed bug #24856: the result set of a ROLLUP query with DISTINCT could lack 
some rollup rows (rows with NULLs for grouping attributes) if GROUP BY
list contained constant expressions.

This happened because the results of constant expressions were not put
in the temporary table used for duplicate elimination. In fact a constant
item from the GROUP BY list of a ROLLUP query can be replaced for an
Item_null_result object when a rollup row is produced . 

Now the JOIN::rollup_init function wraps any constant item referenced in
the GROYP BY list of a ROLLUP query into an Item_func object of a special
class that is never detected as constant item. This ensures creation of
fields for such  constant items in temporary tables and guarantees right
results when the result of the rollup operation first has to be written
into a temporary table, e.g. in the cases when duplicate elimination is
required.
 2007-04-29 16:04:43 -07:00
evgen@moonbone.local
7505fc8228 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/mnt/gentoo64/work/16377-bug-5.0-opt-mysql
 2007-04-29 20:26:57 +04:00