cmiller@zippy.cornsilk.net
e72bc63906
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-09-28 10:15:32 -04:00
cmiller@zippy.cornsilk.net
b2ee81a6ec
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2006-09-28 10:09:57 -04:00
cmiller@zippy.cornsilk.net
290bb8ec14
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-09-28 07:26:45 -04:00
gluh@gluh.(none)
b7e59b7085
Merge mysql.com:/home/gluh/MySQL/Merge/5.0
...
into mysql.com:/home/gluh/MySQL/Merge/5.1
2006-09-28 14:09:31 +05:00
ramil/ram@mysql.com/myoffice.izhnet.ru
47c2c590c8
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/usr/home/ram/work/5.0-maint.b22227
2006-09-28 10:41:09 +05:00
gluh@mysql.com/gluh.(none)
c3d63bef2b
after merge fix
2006-09-27 19:21:29 +05:00
gluh@mysql.com/gluh.(none)
437c94317b
Merge mysql.com:/home/gluh/MySQL/Merge/4.1
...
into mysql.com:/home/gluh/MySQL/Merge/5.0
2006-09-27 18:06:46 +05:00
gluh@mysql.com/gluh.(none)
a039376c43
Patch for bug#21432 is reverted
2006-09-27 17:49:16 +05:00
brian@zim.(none)
f9a02811da
Removed Field (this came in as an idea from a previous patch by Serg)
2006-09-26 21:26:04 -07:00
jani/jamppa@production.mysql.com
201b810cf4
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into production.mysql.com:/usersnfs/jamppa/mysql-5.1-bug-20208
2006-09-25 08:10:58 +02:00
jani@ua141d10.elisa.omakaista.fi
0fb727866f
Fixed result file. Blob width 8192 changed to 16777216.
2006-09-22 16:35:52 +03:00
ramil/ram@mysql.com/myoffice.izhnet.ru
0b28a24861
Fix for bug #22227 : ulong not defined for client library
...
- don't use (ulong) type cast in the include/mysql_com.h as it's not
a standard type and might cause compilation errors on some platforms.
2006-09-22 14:46:18 +05:00
georg@lmy002.wdf.sap.corp
f4af1d8283
Windows 64bit fixes
...
Fixed udf_example, so tests now can also run udf on win.
2006-09-21 15:19:20 +02:00
acurtis/antony@ltamd64.xiphis.org
424857e0e4
Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into xiphis.org:/home/antony/work2/engines-merge
2006-09-18 12:16:03 -07:00
svoj@april.(none)
f21eadfc74
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into april.(none):/home/svoj/devel/mysql/merge/mysql-5.0-engines
2006-09-18 16:23:45 +05:00
baker@bk-internal.mysql.com
343e08391d
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2006-09-16 07:19:42 +02:00
cmiller@zippy.cornsilk.net
dc8449886f
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-09-15 18:19:09 -04:00
brian@zim.(none)
f79ddec1f2
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zim.(none):/home/brian/mysql/merge-5.1
2006-09-15 10:48:30 -07:00
brian@zim.(none)
7194b6d75a
This changes the order of the universe, black is now the new white.
...
In practice this means that handlerton is now created by the server and is passed to the engine. Plugin startups can now also control how plugins are inited (and can optionally pass values). Bit more flexibility to those who want to write plugin interfaces to the database.
2006-09-15 10:28:00 -07:00
msvensson@shellback.(none)
6a0841a1bc
Add definition of SHUT_RDWR for compiling on windows
2006-09-15 17:53:45 +02:00
msvensson@shellback.(none)
59c80b4165
Merge shellback.(none):/home/msvensson/mysql/work/my50-work
...
into shellback.(none):/home/msvensson/mysql/work/my51-work
2006-09-15 16:50:25 +02:00
msvensson@shellback.(none)
a297c29243
Merge msvensson.mysql.internal:mysql/my50-m-bug21222
...
into shellback.(none):/home/msvensson/mysql/work/my50-work
2006-09-15 16:49:24 +02:00
bar@mysql.com/bar.intranet.mysql.r18.ru
72af9c2fef
Better comment text (thanks to SergeyP for suggestions made for the b#20471 patch)
2006-09-14 10:05:07 +05:00
bar@mysql.com/bar.intranet.mysql.r18.ru
474779937b
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b20471v2
2006-09-14 09:12:47 +05:00
tsmith@maint2.mysql.com
6a31ec2cad
Merge maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/50
...
into maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/51
2006-09-13 09:03:52 +02:00
msvensson@neptunus.(none)
4ae7c5a429
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-09-12 14:49:41 +02:00
serg@janus.mylan
62b5c384df
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-arch
...
into janus.mylan:/usr/home/serg/Abk/mysql-5.1-arch
2006-09-09 10:27:12 +02:00
msvensson@shellback.(none)
e03a0617a0
Merge shellback.(none):/home/msvensson/mysql/mysql-5.1
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-09-08 16:01:51 +02:00
gluh@mysql.com/gluh.(none)
e2684ad5d7
after merge fix
2006-09-07 18:09:49 +05:00
serg@janus.mylan
e1db08e1da
minor plugin api fixes:
...
remove #define __attribute__(A) from plugin.h
increase API version because placeholders were added
more robust definition of min_plugin_interface_version
2006-09-07 12:56:32 +02:00
gluh@mysql.com/gluh.(none)
76b97433c2
Merge mysql.com:/home/gluh/MySQL/Merge/4.1-merge
...
into mysql.com:/home/gluh/MySQL/Merge/5.0
2006-09-07 15:17:46 +05:00
arjen@mysql.com/albus.bitbike.com
f5cebbdfba
errmsg.txt:
...
Update of Dutch errmsg translations (not complete yet)
errmsg.h:
Fixup of changed error message file path in comment
authors.h:
Ego add.
2006-09-07 13:52:30 +10:00
brian@zim.(none)
c7baf60267
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zim.(none):/tmp/mysql-5.1-arch
2006-09-01 09:19:10 -07:00
georg@lmy002.wdf.sap.corp
5686da41ac
Fixes for crashes and test failures
2006-09-01 14:34:37 +02:00
evgen@moonbone.local
e1c245bff3
Merge moonbone.local:/home/evgen/bk-trees/mysql-5.1-opt
...
into moonbone.local:/work/tmp_merge-5.1-mysql
2006-09-01 14:08:38 +04:00
msvensson@shellback.(none)
8de35293af
Merge shellback.(none):/home/msvensson/mysql/mysql-5.1
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-09-01 11:23:08 +02:00
brian@zim.(none)
422ab2973b
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zim.(none):/tmp/mysql-5.1-arch
2006-08-31 13:42:46 -07:00
kostja@bodhi.local
bddfef1e36
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into bodhi.local:/opt/local/work/mysql-5.0-14897
2006-08-31 12:34:06 +04:00
acurtis/antony@xiphis.org/ltantony.xiphis.org
38a59efbc9
add 2 placeholder values for config and system variables.
2006-08-30 14:27:29 -07:00
acurtis/antony@xiphis.org/ltantony.xiphis.org
678e15174e
Bug#20573
...
"strict mode: inserts autogenerated auto_increment value bigger than max"
Strict mode should fail if autoincrement value is out of range
2006-08-30 13:20:39 -07:00
kent@mysql.com/c-7b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
e5fbc6cff8
Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2006-08-30 19:31:57 +02:00
gluh@mysql.com/gluh.(none)
af9895d4c2
Bug#20393 User name truncation in mysql client
...
Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
2006-08-30 15:56:17 +05:00
kostja@bodhi.local
ebb7070430
Merge bodhi.local:/opt/local/work/mysql-5.0-runtime-safemerge
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
2006-08-30 03:00:19 +04:00
kostja@bodhi.local
f8d34e1030
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into bodhi.local:/opt/local/work/mysql-5.0-14897
2006-08-30 00:45:33 +04:00
evgen@moonbone.local
8cf9781717
Merge moonbone.local:/work/tmp_merge-5.0-mysql
...
into moonbone.local:/work/tmp_merge-5.1-opt-mysql
2006-08-29 18:58:50 +04:00
iggy@rolltop.ignatz42.dyndns.org
76bf7c81ae
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint_21527
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-new-maint_21527
2006-08-28 20:41:22 -04:00
cmiller@zippy.cornsilk.net
c7431de431
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/release/mysql-5.0-release_mergable
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/release/mysql-5.0-release
2006-08-25 11:56:19 -04:00
cmiller@zippy.cornsilk.net
5ea2a01fee
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/release/mysql-5.0-release_mergable
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/release/mysql-5.0-maint
2006-08-25 11:55:43 -04:00
cmiller@zippy.cornsilk.net
89d759b93e
Bug#21543: 5.0.24 breaks ABI compatibility for python bindings: \
...
InterfaceError on connect
Removed the bool flag from the st_mysql_options struct, since it adds
another word in size to the memory size and shifts member memory locations
down, both of which break binary-interface compatibility.
Instead, use a flag, 2**30, in the client_options bit-field to represent
that the client should check the SSL certificate of the server.
2006-08-25 11:54:33 -04:00
tnurnberg@salvation.intern.azundris.com
a417492688
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1-maint
2006-08-24 21:12:17 +02:00