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
38978 commits 2776 branches 343 tags 1.6 GiB
Commit graph

1628 commits

Author SHA1 Message Date
tsmith/tim@siva.hindu.god
285c14d3e7 Merge siva.hindu.god:/usr/home/tim/m/bk/b4053/51 
into  siva.hindu.god:/usr/home/tim/m/bk/tmp/mrgOct16/51
 2006-10-16 20:10:48 -06:00
msvensson@neptunus.(none)
ca21b57992 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-10-03 09:28:44 +02:00
svoj@april.(none)
115c4fe8dc Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
 2006-10-02 15:11:08 +05:00
tsmith/tim@siva.hindu.god
44f0e55ca4 Merge siva.hindu.god:/usr/home/tim/m/bk/50 
into  siva.hindu.god:/usr/home/tim/m/bk/mrg/51
 2006-09-29 18:04:34 -06:00
cmiller@zippy.cornsilk.net
5275e2437a Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2006-09-29 16:24:21 -04:00
jimw@rama.(none)
c8801bcecc Merge rama.(none):/home/jimw/my/mysql-5.0-clean 
into  rama.(none):/home/jimw/my/mysql-5.1-clean
 2006-09-28 18:00:26 -07:00
svoj@april.(none)
7ed413d17b Merge mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-5.1-engines
 2006-09-29 00:23:43 +05:00
svoj@mysql.com/april.(none)
ad7da7f1de Merge mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-5.0-engines
 2006-09-29 00:00:27 +05:00
svoj@mysql.com/april.(none)
b271d7653b BUG#21617 - crash when selecting from merge table with inconsistent indexes 
Crash may happen when selecting from a merge table that has underlying
tables with less indexes than in a merge table itself.

If number of keys in merge table is not bigger than requested key number,
return error.
 2006-09-28 22:10:06 +05:00
gkodinov/kgeorge@macbook.gmz
a01e7b12ce Merge macbook.gmz:/Users/kgeorge/mysql/work/B21174-5.0-opt 
into  macbook.gmz:/Users/kgeorge/mysql/work/B21174-5.1-opt
 2006-09-27 13:03:41 +03:00
holyfoot/hf@mysql.com/deer.(none)
f8eeebbc4c Merge mysql.com:/home/hf/work/mysql-4.1.15428 
into  mysql.com:/home/hf/work/mysql-5.0-mrg
 2006-09-25 16:44:53 +05:00
tsmith/tim@siva.hindu.god
da3e328ebf Remove unused (and incorrect) my_lread() and my_lwrite() 2006-09-14 23:29:44 -06:00
tsmith/tim@siva.hindu.god
d2e030cae3 Merge siva.hindu.god:/usr/home/tim/m/bk/tmp/50 
into  siva.hindu.god:/usr/home/tim/m/bk/tmp/51
 2006-09-14 23:23:48 -06:00
tsmith/tim@siva.hindu.god
fb6625e495 Merge siva.hindu.god:/usr/home/tim/m/bk/tmp/41 
into  siva.hindu.god:/usr/home/tim/m/bk/tmp/50
 2006-09-14 23:22:25 -06:00
tsmith/tim@siva.hindu.god
43e8890abc Merge siva.hindu.god:/usr/home/tim/m/bk/tmp/40 
into  siva.hindu.god:/usr/home/tim/m/bk/tmp/41
 2006-09-14 23:20:13 -06:00
tsmith/tim@siva.hindu.god
7b9f4086fa Bug #4053: too many of "error 1236: 'binlog truncated in the middle of event' from master" 
- Fix my_read/my_write to handle return values from read/write correctly
- Add debugging 'deprecated function' warning to my_lread/my_lwrite
- Add debugging 'error, read/write interrupt not handled' warning to my_quick_read/my_quick_write

There is no test case associated with these changes.  However, this is a conservative change,
and no repeatable test case is available.
 2006-09-14 23:19:24 -06:00
tsmith/tim@siva.hindu.god
5ec2bfe94c Bug #4053: too many of "error 1236: 'binlog truncated in the middle of event' from master" 
- Detect read failure in my_read_charset_file
 2006-09-14 21:06:14 -06:00
jimw@rama.(none)
ce0846b862 Bug #18246: compilation error with tcp_wrapper 
Fix the functions in my_libwrap.c to return the results of the
  underlying call to libwrap.
 2006-09-11 16:23:45 -07:00
holyfoot/hf@mysql.com/deer.(none)
c32f62bebb bug #12620 (UTF-8 indexing causes ER_NO_KEYFILE error) 
The problem is that on some Mac OS X-es the file writing/reading
call with zero bytes to read/write returns error.
So here i try to eliminate that kinds of calls.
 2006-09-04 19:47:24 +05:00
grichter@bk-internal.mysql.com
6993e3a3f7 Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-cmake
 2006-09-02 11:03:16 +02:00
georg@lmy002.wdf.sap.corp
5686da41ac Fixes for crashes and test failures 2006-09-01 14:34:37 +02:00
georg@lmy002.wdf.sap.corp
9d6471c33e make dist changes for Cmake build 2006-09-01 10:32:12 +02:00
georg@lmy002.wdf.sap.corp
27636d9303 Additional files for cmake support 2006-08-31 19:52:42 +02:00
cmiller@zippy.cornsilk.net
9c94dade04 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug04053/my41-bug04053 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
 2006-08-31 12:45:49 -04:00
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
brian@zim.(none)
41f920b013 Merge zim.(none):/home/brian/mysql/dep-5.1 
into  zim.(none):/home/brian/mysql/remove-bdb-5.1
 2006-08-14 21:26:33 -07:00
brian@zim.(none)
4d7f7fb878 Removed warnings for Windows build issues. Edited Windows README to remove reference to BDB. 2006-08-14 14:45:48 -07:00
kroki/tomash@moonlight.intranet
aca2c3761a Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge
 2006-08-10 16:11:55 +04:00
georg@lmy002.wdf.sap.corp
5f5c7bade3 Bug #21396: Wrong error number generated for a missing table 2006-08-02 10:00:28 +02:00
gkodinov/kgeorge@macbook.gmz
6909ab2627 serg's MacOSX-intel portability diff 2006-08-01 11:34:11 +03:00
kroki/tomash@moonlight.intranet
cc98d26a23 Fix after manual merge. 2006-07-29 13:50:08 +04:00
kroki/tomash@moonlight.intranet
5c90b6f810 Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-merge
 2006-07-29 13:43:34 +04:00
kroki/tomash@moonlight.intranet
4e845cccc4 BUG#21206: memory corruption when too many cursors are opened at once 
Too many cursors (more than 1024) could lead to memory corruption.
This affects both, stored routines and C API cursors, and the
threshold is per-server, not per-connection.  Similarly, the
corruption could happen when the server was under heavy load
(executing more than 1024 simultaneous complex queries), and this is
the reason why this bug is fixed in 4.1, which doesn't support
cursors.

The corruption was caused by a bug in the temporary tables code, when
an attempt to create a table could lead to a write beyond allocated
space.  Note, that only internal tables were affected (the tables
created internally by the server to resolve the query), not tables
created with CREATE TEMPORARY TABLE.  Another pre-condition for the
bug is TRUE value of --temp-pool startup option, which, however, is a
default.

The cause of a bug was that random memory was overwritten in
bitmap_set_next() due to out-of-bound memory access.
 2006-07-26 16:23:07 +04:00
tsmith/tim@siva.hindu.god
6971ddee1a Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  siva.hindu.god:/usr/home/tim/m/bk/merge-51
(which is mysql-5.1-new-maint team tree)
 2006-07-15 00:33:24 -06:00
kostja@bodhi.local
d7845b74db Merge bodhi.local:/opt/local/work/tmp_merge 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge-5.0
 2006-07-13 22:09:36 +04:00
mkindahl@dl145k.mysql.com
9415b24139 Merge dl145k.mysql.com:/data0/mkindahl/bkroot/mysql-5.1-new-rpl 
into  dl145k.mysql.com:/data0/mkindahl/bk/MERGE/mysql-5.1-merge
 2006-07-11 12:17:19 +02:00
cmiller@zippy.(none)
9be1c70404 Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1 
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new-maint
 2006-07-10 13:38:22 -04:00
mats@romeo.(none)
b6384f46f1 Fixing the prototype for my_strndup() to compile on Windows. 2006-07-07 22:38:57 +02:00
mats@romeo.(none)
fe4a22f36b Correcting signature for my_strndup to be able to build on Windows 
in pushbuild on Replication/Backup team tree.
 2006-07-07 15:59:17 +02:00
konstantin@bodhi.netgear
01bc761690 Merge bodhi.netgear:/opt/local/work/tmp_merge 
into  bodhi.netgear:/opt/local/work/mysql-5.1-runtime-merge-with-5.0
 2006-07-06 22:55:48 +04:00
cmiller@zippy.(none)
91b8b26411 Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1 
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new-maint
 2006-07-05 16:16:09 -04:00
ingo@mysql.com
d8546d07f8 Merge mysql.com:/home/mydev/mysql-5.0-tmp_merge 
into  mysql.com:/home/mydev/mysql-5.1-amerge
 2006-07-04 10:02:11 +02:00
cmiller@zippy.(none)
6110a83a0e Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.0 
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1
 2006-07-03 11:35:58 -04:00
petr@owlet.
b655968123 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/cps/mysql/trees/5.1-team
 2006-06-30 11:17:53 +04:00
petr@mysql.com
c95ad6158a cleanup 2006-06-30 08:11:51 +04:00
monty@mysql.com
d76830faa5 Merge mysql.com:/home/my/mysql-4.1 
into  mysql.com:/home/my/mysql-5.0
 2006-06-30 02:35:52 +03:00
petr@mysql.com
157cc569a8 fix test failures 2006-06-30 03:28:58 +04:00