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
tsmith@quadxeon.mysql.com
6252477a7b
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
2007-03-19 23:10:58 +01:00
kostja@bodhi.local
bdb10baec1
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime
2007-03-20 00:42:11 +03:00
kostja@bodhi.local
a9065201d5
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into bodhi.local:/opt/local/work/mysql-5.0-runtime
2007-03-19 23:59:53 +03:00
jani@ua141d10.elisa.omakaista.fi
6e9add70ec
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-marvel
2007-03-19 11:22:10 +02:00
jani@ua141d10.elisa.omakaista.fi
71c7035035
Added find_type_or_exit and find_bit_type_or_exit as wrappers
...
around the original functions. These will ensure that error
message is always in unique form, reduce code and print the
right alternatives automatically in an error case.
2007-03-19 11:19:51 +02:00
serg@janus.mylan
e9fb4a686f
dbug/dbug.c: unused variable removed
...
include/config-win.h: SIZEOF_INT
include/my_global.h: win64 fix
support-files/Makefile.am: automake magic
2007-03-17 11:19:21 +01:00
serg@janus.mylan
68fd66e853
wl#3700 - post-review fixes:
...
s/ulonglong/key_part_map/, comments
2007-03-17 00:13:25 +01:00
serg@janus.mylan
f813272125
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into janus.mylan:/usr/home/serg/Abk/mysql-5.1
2007-03-16 14:09:30 +01:00
malff/marcsql@weblab.(none)
e677c6e70f
Manual merge from 5.0-runtime to 5.1-runtime
2007-03-14 17:38:06 -06:00
kent@kent-amd64.(none)
9d396c6996
Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
...
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
2007-03-12 13:29:11 +01:00
kent@mysql.com/kent-amd64.(none)
30537c7d75
Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build
...
into mysql.com:/home/kent/bk/tmp/mysql-5.0-build
2007-03-12 13:22:02 +01:00
kent@mysql.com/kent-amd64.(none)
cad1c35618
Merge mysql.com:/home/kent/bk/tmp/mysql-4.0
...
into mysql.com:/home/kent/bk/tmp/mysql-4.1-build
2007-03-12 13:15:11 +01:00
kent@mysql.com/kent-amd64.(none)
4e4f184170
Makefile.am, configure.in, mysys.dsp:
...
Removed unused files
.del-my_winsem.c:
Delete: mysys/my_winsem.c
.del-my_semaphore.c:
Delete: mysys/my_semaphore.c
.del-my_semaphore.h:
Delete: include/my_semaphore.h
2007-03-12 13:12:42 +01:00
Kristofer.Pettersson@naruto.
ab28345a4b
Merge naruto.:C:/cpp/bug25042/my50-bug25042
...
into naruto.:C:/cpp/mysql-5.0-maint
2007-03-09 08:02:29 +01:00
anozdrin/alik@booka.opbmk
c666e2f276
Polishing: use constants instead of magic numbers.
2007-03-09 08:05:08 +03:00
tsmith@quadxeon.mysql.com
79191807ff
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg0306/51
2007-03-07 07:21:24 +01:00
kostja@bodhi.local
3d488d496d
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
2007-03-06 16:44:14 +03:00
serg@janus.mylan
6aa5c001c5
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into janus.mylan:/usr/home/serg/Abk/mysql-5.1
2007-03-06 13:44:57 +01:00
antony@ppcg5.local
dc24473cb2
WL#2936
...
"Server Variables for Plugins"
Implement support for plugins to declare server variables.
Demonstrate functionality by removing InnoDB specific code from sql/*
New feature for HASH - HASH_UNIQUE flag
New feature for DYNAMIC_ARRAY - initializer accepts preallocated ptr.
Completed support for plugin reference counting.
2007-03-02 08:43:45 -08:00
msvensson@pilot.blaudden
f5778fc73e
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-01 18:12:56 +01:00
msvensson@pilot.blaudden
51a71fb667
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-01 14:53:32 +01:00
malff/marcsql@weblab.(none)
dc98aa82ab
Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base
...
into weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge
2007-02-28 18:14:56 -07:00
lars/lthalmann@dl145k.mysql.com
504b4d2dfb
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-02-28 22:32:44 +01:00
jani@ua141d10.elisa.omakaista.fi
bcbc0031eb
Fixed compiler warnings.
2007-02-28 22:23:35 +02:00