mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 23:04:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
37145 commits 2774 branches 343 tags 1.6 GiB
Commit graph

37145 commits

This branch
This branch
All branches
Author SHA1 Message Date
cmiller@zippy.cornsilk.net
a55ba58dc9 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug04053/my50-bug04053 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug04053/my51-bug04053
 2006-08-30 21:53:33 -04:00
cmiller@zippy.cornsilk.net
fdb54d4f05 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug04053/my41-bug04053 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug04053/my50-bug04053
 2006-08-30 21:52:17 -04:00
cmiller@zippy.cornsilk.net
5a3922fbf1 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug04053/my40-bug04053 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug04053/my41-bug04053
 2006-08-30 17:33:28 -04:00
cmiller@zippy.cornsilk.net
2c356ec7db Bug#4053: too many of "error 1236: 'binlog truncated in the middle of \ 
event' from master"

Since there is no repeatable test case, and this is obviously wrong, this is
the most conservative change that might possibly work.  

The syscall  read()  wasn't checked for a negative return value for an
interrupted read.  The kernel  sys_read()  returns -EINTR, and the "library" 
layer maps that to return value of -1 and sets  errno  to EINTR.  It's 
impossible (on Linux) for  read()  to set errno EINTR without the return 
value being -1 .

So, if we're checking for EINTR behavior, we should not require that the
return value be zero.
 2006-08-30 17:28:34 -04:00
cmiller@zippy.cornsilk.net
6233d8c696 Correcting bad merge. 2006-08-29 09:30:58 -04:00
iggy@rolltop.ignatz42.dyndns.org
5de6240a93 Post merge changes. 2006-08-28 21:13:55 -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
iggy@rolltop.ignatz42.dyndns.org
bfe86ca448 Bug #21527 mysqldump incorrectly tries to LOCK TABLES on the information_schema database. 
init_dumping now accepts a function pointer to the table or view specific init_dumping function.  This allows both tables and views to use the init_dumping function.
 2006-08-28 17:48:06 -04:00
tnurnberg@salvation.intern.azundris.com
d847e46c1a Merge salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1 
into  salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1-maint
 2006-08-28 19:35:25 +02:00
tnurnberg@salvation.intern.azundris.com
499553365e Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1
 2006-08-28 19:30:58 +02:00
brian@zim.(none)
7216b5bc7a Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zim.(none):/home/brian/mysql/arch-5.1
 2006-08-25 14:07:30 -07:00
brian@zim.(none)
e831273902 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch 
into  zim.(none):/home/brian/mysql/arch-5.1
 2006-08-25 13:32:06 -07:00
brian@zim.(none)
baa914e66d Cleanup of unused variables. 
Fixed "discover" in the handler API.

Fixed problem where handlerton was not zero'ed. I need to look around, I suspect this problem is more widespread.
 2006-08-25 13:31:15 -07: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
acurtis/antony@xiphis.org/ltantony.xiphis.org
aeea252b4d no longer need ifdef as plugin is conditionally compiled 2006-08-25 00:37:01 -07:00
acurtis/antony@xiphis.org/ltantony.xiphis.org
b68f0437e7 fix for windows build 2006-08-24 22:10:55 -07:00
cmiller@zippy.cornsilk.net
b9aaf4b24d Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1-new-maint
 2006-08-24 16:47:59 -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
iggy@rolltop.ignatz42.dyndns.org
a21ec5dbd4 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint_11972 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-new-maint_11972
 2006-08-24 15:03:33 -04:00
tnurnberg@salvation.intern.azundris.com
030cbd2f73 Merge salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1 
into  salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1-maint
 2006-08-24 19:11:51 +02:00
iggy@rolltop.ignatz42.dyndns.org
e4bfce3058 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint_11972
 2006-08-24 11:19:33 -04:00
iggy@rolltop.ignatz42.dyndns.org
8bc745456f Bug #11972: client uses wrong character set after reconnect. 
The mysql client uses the default character set on reconnect.  The default character set is now controled by the client charset command while the client is running.  The charset command now also issues a SET NAMES command to the server to make sure that the client's charset settings are in sync with the server's.
 2006-08-24 11:15:08 -04:00
msvensson@neptunus.(none)
0b3c2aa1b3 Merge neptunus.(none):/home/msvensson/mysql/bug21749/my50-bug21749 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-08-24 16:46:37 +02:00
msvensson@neptunus.(none)
984e9ce099 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-08-24 16:08:25 +02:00
kent@c-7b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
5a9cceec39 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/Users/kent/mysql/bk/mysql-5.1-maint
 2006-08-24 16:06:12 +02:00
kent@c-7b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
386743c783 Merge mysql.com:/Users/kent/mysql/bk/bug17194/my51-bug17194 
into  mysql.com:/Users/kent/mysql/bk/mysql-5.1-maint
 2006-08-24 15:12:08 +02:00
msvensson@neptunus.(none)
bc22aa60e6 Merge neptunus.(none):/home/msvensson/mysql/my51-m-bug20841 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-08-24 15:07:57 +02:00
kent@mysql.com/c-7b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
68e1e60f27 Merge mysql.com:/Users/kent/mysql/bk/bug17194/my50-bug17194 
into  mysql.com:/Users/kent/mysql/bk/mysql-5.0-maint
 2006-08-24 14:51:54 +02:00
msvensson@neptunus.(none)
81a0090333 Bug#20841 mysqldump fails to store right info with --compatible=mysql40 option 
- Add "not in version before" commensta around new syntax "WITH PARSER" and "TABLESPACE xxx STORAGE DISK"
 2006-08-24 14:27:57 +02:00
petr/cps@owlet.local
257ce16d58 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  mysql.com:/home/cps/mysql/trees/mysql-5.1-virgin
 2006-08-24 16:18:58 +04:00
petr/cps@mysql.com/owlet.local
e36be72adb after merge fix 2006-08-24 16:17:42 +04:00
msvensson@neptunus.(none)
5cccfba5ee Merge neptunus.(none):/home/msvensson/mysql/bug21749/my51-bug21749 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-08-24 14:13:37 +02:00
msvensson@neptunus.(none)
d58af76d68 Merge neptunus.(none):/home/msvensson/mysql/bug21749/my50-bug21749 
into  neptunus.(none):/home/msvensson/mysql/bug21749/my51-bug21749
 2006-08-24 12:19:41 +02:00
msvensson@neptunus.(none)
b25b49a05a Cset exclude: msvensson@neptunus.(none)|ChangeSet|20060612110740|13873 2006-08-24 11:39:52 +02:00
tsmith@maint1.mysql.com
6420c9e3e7 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  maint1.mysql.com:/data/localhome/tsmith/bk/51
 2006-08-24 02:49:07 +02:00
tsmith@maint1.mysql.com
2225f14755 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  maint1.mysql.com:/data/localhome/tsmith/bk/50
 2006-08-24 02:49:03 +02:00
tsmith/tim@siva.hindu.god
24f567fa40 Merge siva.hindu.god:/usr/home/tim/m/bk/beef-51 
into  siva.hindu.god:/usr/home/tim/m/bk/51
 2006-08-23 18:33:02 -06:00
tsmith/tim@siva.hindu.god
80e565dfe1 Merge siva.hindu.god:/usr/home/tim/m/bk/beef-50 
into  siva.hindu.god:/usr/home/tim/m/bk/50
 2006-08-23 18:31:15 -06:00
tsmith/tim@siva.hindu.god
a3cb3d2c41 Merge siva.hindu.god:/usr/home/tim/m/bk/beef-50 
into  siva.hindu.god:/usr/home/tim/m/bk/beef-51
 2006-08-23 18:27:34 -06:00
tsmith/tim@siva.hindu.god
df6b8516c4 Merge siva.hindu.god:/usr/home/tim/m/bk/b21531-41 
into  siva.hindu.god:/usr/home/tim/m/bk/beef-50
 2006-08-23 18:24:59 -06:00
tsmith/tim@siva.hindu.god
45460bd0af Bug #21531: EXPORT_SET() doesn't accept args with coercible character sets 
- Fix typo in Item_func_export_set::fix_length_and_dec() which caused character set aggregation to fail
- Remove default argument from last arg of agg_arg_charsets() function, to reduce potential errors
 2006-08-23 18:02:31 -06:00
cmiller@zippy.cornsilk.net
05df2f9402 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0-maint-gca 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0-maint
 2006-08-23 18:37:04 -04:00
cmiller@zippy.cornsilk.net
006f27cf9a Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1-new-maint
 2006-08-23 18:31:20 -04:00
cmiller@zippy.cornsilk.net
2a06452bde Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0-maint-gca 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1-new-maint
 2006-08-23 18:29:44 -04:00
cmiller@zippy.cornsilk.net
a4f32ff2e8 String broken up to avoid silly MICROS~1 string-size limit. 2006-08-23 18:29:05 -04:00
tsmith/tim@siva.hindu.god
ade64d467e Merge siva.hindu.god:/usr/home/tim/m/bk/b20536-50 
into  siva.hindu.god:/usr/home/tim/m/bk/50
 2006-08-23 16:28:53 -06:00
tsmith/tim@siva.hindu.god
7503ca1da0 Merge siva.hindu.god:/usr/home/tim/m/bk/b20536-51 
into  siva.hindu.god:/usr/home/tim/m/bk/51
 2006-08-23 16:27:06 -06:00
brian@zim.(none)
d41188130a This is a cleanup of warnings that windows is complaining about. 2006-08-23 15:12:42 -07:00
tsmith/tim@siva.hindu.god
cf5f2693f2 Merge siva.hindu.god:/usr/home/tim/m/bk/b20536-50 
into  siva.hindu.god:/usr/home/tim/m/bk/b20536-51
 2006-08-23 16:03:57 -06:00