mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 07:14:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
46696 commits 2776 branches 343 tags 1.6 GiB
Commit graph

46696 commits

This branch
This branch
All branches
Author SHA1 Message Date
holyfoot/hf@mysql.com/hfmain.(none)
28eddbe12b Merge bk@192.168.21.1:mysql-5.0-opt 
into  mysql.com:/home/hf/work/8663/my50-8663
 2007-05-17 00:09:43 +05:00
joerg@trift2.
d84c807204 After-merge fix in "scripts/make_win_bin_dist": 
Ensure the balanced use of 'x' guards in string comparisons also in the new 5.1 lines.
 2007-05-16 21:00:35 +02:00
joerg@trift2.
b3f35b8be5 Manual merge. 2007-05-16 20:52:50 +02:00
svoj@mysql.com/april.(none)
3ea2ee357b BUG#25712 - insert delayed and check table run together report crashed 
tables

In case system doesn't have native pread/pwrite calls (e.g. Windows)
and there is CHECK TABLE runs concurrently with another statement that
reads from a table, the table may be reported as crashed.

This is fixed by locking file descriptor when my_seek is executed on
MyISAM index file and emulated pread/pwrite may be executed concurrently.

Affects MyISAM tables on platforms that do not have native
pread/pwrite calls (e.g. Windows).

No deterministic test case for this bug.
 2007-05-16 23:42:32 +05:00
joerg@trift2.
453af10529 Ensure that the 5.1 version of "scripts/make_win_bin_dist" depends on 5.0, 
so that changes from 5.0 propagate (on merge) into the 5.1 version.
 2007-05-16 20:29:49 +02:00
holyfoot/hf@hfmain.(none)
cd4fbe116e Merge mysql.com:/home/hf/work/8663/my50-8663 
into  mysql.com:/home/hf/work/8663/my51-8663
 2007-05-16 23:01:21 +05: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
df@pippilotta.erinye.com
6bf66552bd 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-16 17:28:09 +02:00
df@pippilotta.erinye.com
5e541e98a2 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-05-16 17:27:30 +02:00
df@pippilotta.erinye.com
000c92a3bc 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.1-build
 2007-05-16 17:27:19 +02:00
df@pippilotta.erinye.com
fbd59055ec Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build-work 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build
 2007-05-16 17:26:55 +02:00
df@pippilotta.erinye.com
3bff0c581c 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-16 17:26:18 +02:00
df@pippilotta.erinye.com
35ca5b1ef1 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-05-16 17:26:02 +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
df@pippilotta.erinye.com
558e6d9aa5 Merge bk-internal:/home/bk/mysql-5.1-runtime 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-05-16 17:13:46 +02:00
df@pippilotta.erinye.com
4e0af1afdc Merge bk-internal:/home/bk/mysql-5.0-runtime 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-05-16 17:13:42 +02:00
df@pippilotta.erinye.com
dabeacaca6 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-16 17:08:28 +02:00
df@pippilotta.erinye.com
a645ef0480 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-16 17:07:34 +02:00
msvensson@pilot.blaudden
7147db553d Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-05-16 16:31:30 +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
gluh@mysql.com/eagle.(none)
72b7b7de24 valgrind error fix 2007-05-16 19:19:23 +05:00
df@pippilotta.erinye.com
2ea846c533 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-16 16:04:42 +02:00
df@pippilotta.erinye.com
ebab70bcb0 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
 2007-05-16 16:03:30 +02:00
kostja@vajra.(none)
e4a3189c4f Comment fix. 2007-05-16 17:19:59 +04:00
thek@adventure.(none)
6d6674e71f Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime
 2007-05-16 14:54:47 +02:00
thek@adventure.(none)
06ce477223 Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
 2007-05-16 14:51:01 +02:00
thek@adventure.(none)
0e82ce84c9 Merge adventure.(none):/home/thek/Development/cpp/bug27415/my50-bug27415 
into  adventure.(none):/home/thek/Development/cpp/bug27415/my51-bug27415
 2007-05-16 14:48:31 +02:00
thek@adventure.(none)
ed43ceb178 Bug#27415 Text Variables in stored procedures 
- Problem was reported as a SP variable using itself as 
   right value inside SUBSTR caused corruption of data. 
 - This bug could not be verified in either 5.0bk or 5.1bk
 - Added test case to prevent future regressions.
 2007-05-16 14:25:38 +02:00
kostja@vajra.(none)
672f2bd548 Fix a typo. 2007-05-16 16:05:19 +04:00
msvensson@pilot.blaudden
c38b188f7d Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-05-16 14:01:14 +02:00
kostja@vajra.(none)
35ad681618 An attempt to fix event_bugs.test failure on Debian 
(Bug#26338 "events_bugs.test fail on Debian")
 2007-05-16 16:01:14 +04: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
afdd1a986f Update to 5.1 format 2007-05-16 13:48:20 +02:00
kostja@vajra.(none)
37843864da Make a stab at events_bugs.test failure under valgrind (no 
open bug report, reproduced in the runtime team tree).
 2007-05-16 15:35:18 +04:00
msvensson@pilot.blaudden
623d936038 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-05-16 12:50:24 +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
mhansson/martin@linux-st28.site
364014e455 Merge mhansson@bk-internal:/home/bk/mysql-5.0-opt 
into  linux-st28.site:/home/martin/mysql/src/5.0o-bug27573
 2007-05-16 12:22:20 +03:00
msvensson@pilot.blaudden
3156fb92d4 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-05-16 10:45:21 +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
07062b6096 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-05-16 10:14:53 +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
kostja@vajra.(none)
1683d65a4b Merge vajra.(none):/opt/local/work/mysql-5.0-21483 
into  vajra.(none):/opt/local/work/mysql-5.1-21483
 2007-05-16 11:50:53 +04:00
kostja@vajra.(none)
bb2a43dd19 Fix a failing assert. 2007-05-16 11:49:15 +04:00
kostja@vajra.(none)
752972b570 Correct a merge error. 2007-05-16 10:32:47 +04:00
kostja@vajra.(none)
e1218d0e75 Merge vajra.(none):/opt/local/work/mysql-5.0-21483 
into  vajra.(none):/opt/local/work/mysql-5.1-21483
 2007-05-16 10:21:39 +04:00
kostja@vajra.(none)
f10effe402 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  vajra.(none):/opt/local/work/mysql-5.0-21483
 2007-05-16 09:52:01 +04:00