msvensson@pilot.blaudden
c405f94cfb
Bug#14862 undefined reference to `isinf' on SOLARIS - strings/strtod.c
...
- Rely only on HAVE_ISINF to determine if 'isinf' can be used.
2007-04-12 10:29:22 +02:00
msvensson@pilot.blaudden
7563ebefca
Bug#25118 ATTRIBUTE_FORMAT_FPTR undeclared in m_ctype.h
...
- Move marcos for __attribute__ usage to my_attribute.h and
include that file where needed
2007-04-12 00:43:25 +02:00
msvensson@pilot.blaudden
2218fafa1f
Merge pilot.blaudden:/home/msvensson/mysql/bug22508/my51-bug22508
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-11 09:34:02 +02:00
jani@ua141d10.elisa.omakaista.fi
b4ba815967
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-marvel
2007-04-10 16:28:47 +03:00
joerg@trift2.
22f066e354
Merge trift2.:/MySQL/M50/mysql-5.0
...
into trift2.:/MySQL/M50/push-5.0
2007-04-07 20:46:43 +02:00
holyfoot/hf@hfmain.(none)
ce426dd622
Merge bk@192.168.21.1:mysql-5.1-opt
...
into mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-04-07 14:59:53 +05:00
tomas@whalegate.ndb.mysql.com
77a1d31fbc
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-04-05 10:24:37 +02:00
tomas@whalegate.ndb.mysql.com
d04730c06d
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-05 10:21:41 +02:00
mskold/marty@mysql.com/linux.site
3e8cf5958b
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2007-04-05 08:39:12 +02:00
kent@mysql.com/kent-amd64.(none)
6249bb34a4
Merge mysql.com:/home/kent/bk/sotest/mysql-4.1-build
...
into mysql.com:/home/kent/bk/sotest/mysql-5.0-build
2007-04-05 08:30:49 +02:00
kent@mysql.com/kent-amd64.(none)
8cc67c011e
Deleted reject files accidently checked in
...
configure.in.rej
include/my_global.h.rej
BUILD/SETUP.sh.rej
mysys/thr_alarm.c.rej
include/my_pthread.h.rej
2007-04-05 08:30:16 +02:00
tomas@whalegate.ndb.mysql.com
343bfb779d
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-04 23:03:27 +02:00
tsmith@quadxeon.mysql.com
cedde5758d
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg04/51
2007-04-04 21:56:10 +02:00
tsmith@quadxeon.mysql.com
e9fd9a18e0
Bug #27638 : slow logging to CSV table inserts bad query_time and lock_time values
...
When MySQL logged slow query information to a CSV table, it stored the
query_time and lock_time values with an incorrect formula.
If the time was over 59 seconds, this caused incorrect statistics (either the
slow query was not logged, or the time was far from correct). This change
fixes the method used to store those TIME values in the slow_log table.
2007-04-04 21:40:47 +02:00
jani@ua141d10.elisa.omakaista.fi
e40d3631a3
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-marvel
2007-04-04 21:25:39 +03:00
mskold/marty@linux.site
552d1086ec
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2007-04-04 17:03:31 +02:00
mskold/marty@linux.site
7e33b92279
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2007-04-04 13:21:49 +02:00
mskold/marty@mysql.com/linux.site
625a2629f0
Bug #26242 UPDATE with subquery and triggers failing with cluster tables
...
In certain cases AFTER UPDATE/DELETE triggers on NDB tables that referenced
subject table didn't see the results of operation which caused invocation
of those triggers. In other words AFTER trigger invoked as result of update
(or deletion) of particular row saw version of this row before update (or
deletion).
The problem occured because NDB handler in those cases postponed actual
update/delete operations to be able to perform them later as one batch.
This fix solves the problem by disabling this optimization for particular
operation if subject table has AFTER trigger for this operation defined.
To achieve this we introduce two new flags for handler::extra() method:
HA_EXTRA_DELETE_CANNOT_BATCH and HA_EXTRA_UPDATE_CANNOT_BATCH.
These are called if there exists AFTER DELETE/UPDATE triggers during a
statement that potentially can generate calls to delete_row()/update_row().
This includes multi_delete/multi_update statements as well as insert statements
that do delete/update as part of an ON DUPLICATE statement.
2007-04-04 12:50:39 +02:00
tsmith@quadxeon.mysql.com
2117193783
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg04/51
2007-04-04 11:05:22 +02:00
gluh@mysql.com/eagle.(none)
2d47f0cb1b
Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
2007-04-03 16:13:27 +05:00
kostja@bodhi.local
93d0316f45
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime
2007-04-03 14:34:37 +04:00
msvensson@pilot.blaudden
fc904eaead
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-02 11:15:09 +02:00
msvensson@pilot.blaudden
bb9a601829
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-02 10:50:39 +02:00
jamppa@bk-internal.mysql.com
71e5d064cc
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
...
into bk-internal.mysql.com:/data0/bk/mysql-5.0-marvel
2007-03-29 18:38:16 +02:00
jamppa@bk-internal.mysql.com
16de7d21cc
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-marvel
2007-03-29 16:11:29 +02:00
msvensson@pilot.blaudden
a16de88489
Merge pilot.blaudden:/home/msvensson/mysql/bug24121/my51-bug24121
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-29 13:37:32 +02:00
antony@ppcg5.local
6f21d39d51
WL#2936
...
"Plugin Server Variables"
Post review cleanups.
2007-03-28 21:29:16 -07:00
kent@kent-amd64.(none)
0544355385
Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
...
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
2007-03-28 23:08:00 +02:00
kent@mysql.com/kent-amd64.(none)
7a2e0ee7d7
configure.in:
...
Don't install ndb man pages if no ndb configured
config-win.h, CMakeLists.txt, README, configure.js:
Removed Cybozu patches
2007-03-28 23:00:50 +02:00
jani@ua141d10.elisa.omakaista.fi
3c3b0391f8
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-main
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-marvel
2007-03-28 20:46:42 +03:00
msvensson@pilot.blaudden
1ccf651a3a
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-28 15:57:27 +02:00
msvensson@pilot.blaudden
f8b3241726
Set yaSSL to use same type as MySQL do for socket handles
2007-03-28 15:34:52 +02:00
serg@janus.mylan
e5b660487b
restored run-time thread lib detection
2007-03-28 15:33:29 +02:00
msvensson@pilot.blaudden
b554258a8e
Bug#22508 BUILD/compile-dist fails due to problem with readline/libedit
...
- Move the link_sources command from top level Makefile into each subdir
that need to link files
2007-03-27 23:56:48 +02:00
msvensson@pilot.blaudden
e57392f4b4
Bug #24121 Incorrect test for SSL_VERIFY_SERVER_CERT
...
- Change 'mysql_options' third argment "arg" to "const void*"
2007-03-27 21:04:05 +02:00
kostja@bodhi.local
e5d6b0afd2
Fix warnings.
2007-03-27 21:57:33 +04:00
kostja@bodhi.local
e56c6d2f25
Change find_type family to accept const TYPELIB*.
2007-03-27 20:27:58 +04:00
jani@ua141d10.elisa.omakaista.fi
e12ad391b5
Fixes for 4.1 to be as in 5.0 and above.
2007-03-27 18:51:02 +03:00
monty@narttu.mysql.fi
28a05d3b33
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
...
into mysql.com:/home/my/mysql-5.1
2007-03-24 11:06:09 +02:00
monty@mysql.com/narttu.mysql.fi
1933603647
Removed not used define YY_MAGIC_BELOW
...
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-03-23 22:08:31 +02:00
antony@ppcg5.local
d4d37f113e
WL#2936
...
"Server variables for plugins"
Post review fixes.
2007-03-23 10:14:46 -07:00
jani@ua141d10.elisa.omakaista.fi
5c542a4656
Fixed compiler warnings.
2007-03-22 20:32:07 +02:00
jamppa@bk-internal.mysql.com
d2838b5abe
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-marvel
2007-03-22 13:14:52 +01:00
tsmith@quadxeon.mysql.com
54e7bc8daa
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
2007-03-22 01:04:39 +01:00
tsmith@quadxeon.mysql.com
4981d45997
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
2007-03-21 23:58:02 +01:00
iggy@recycle.(none)
0d3aefcdf4
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint
...
into recycle.(none):/src/bug23736/my51-bug23736
2007-03-21 13:39:08 -04:00
istruewing@chilla.local
0282c199a0
Merge chilla.local:/home/mydev/mysql-5.1-bug17332-old
...
into chilla.local:/home/mydev/mysql-5.1-bug17332
2007-03-20 17:59:09 +01:00
iggy@recycle.(none)
a56b04476a
Merge recycle.(none):/src/bug23736/my50-bug23736
...
into recycle.(none):/src/bug23736/my51-bug23736
2007-03-20 10:54:56 -04:00
iggy@recycle.(none)
988ce58052
Bug#23736 Pointer free error in mysqlbinlog
...
- Mis-matched SAFEMALLOC defines caused misleading error message.
2007-03-20 10:34:25 -04:00
df@pippilotta.erinye.com
8161dcaacb
build fix for netware
2007-03-20 13:32:49 +01:00