mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
37030 commits 2784 branches 343 tags 1.6 GiB
Commit graph

37030 commits

This branch
This branch
All branches
Author SHA1 Message Date
df@pippilotta.erinye.com
7ed3a78331 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
 2007-06-13 12:37:10 +02:00
df@pippilotta.erinye.com
f5d6c2906d Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-post-commit 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
 2007-06-13 12:35:13 +02:00
df@pippilotta.erinye.com
4f9c468eb9 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-post-commit 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-post-commit
 2007-06-13 11:54:28 +02:00
df@pippilotta.erinye.com
36ea2e3091 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-post-commit 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1
 2007-06-13 11:48:07 +02:00
df@pippilotta.erinye.com
320ec82616 BK changes for 
https://inside.mysql.com/wiki/MySQL's_Code_Reviews_Published_Externally
 2007-06-13 11:44:58 +02:00
ramil/ram@ramil.myoffice.izhnet.ru
87e7709fae Merge mysql.com:/home/ram/work/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b28748/b28748.5.0
 2007-06-13 14:21:44 +05:00
msvensson@pilot.(none)
36ae2387a9 Merge pilot.(none):/data/msvensson/mysql/mysql-4.1-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
 2007-06-13 10:36:47 +02:00
msvensson@pilot.(none)
d2d4e66760 Bug#29065 mysql-test-run.pl aborts execution on missing log file from test tool 
- Make tesingt continue even if test log file does not exists
 2007-06-13 10:35:20 +02:00
kent@mysql.com/kent-amd64.(none)
affeddbd8f make_win_bin_dist: 
Aligned headers to include with Unix 'make install'
 2007-06-12 19:49:02 +02:00
cmiller@zippy.cornsilk.net
da33797903 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint-2
 2007-06-12 10:33:39 -04:00
cmiller@zippy.cornsilk.net
33c59b5d02 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint-2
 2007-06-12 08:48:30 -04:00
cmiller@zippy.cornsilk.net
4c9af55908 Bug#28984: crasher on connect with out of range password length in \ 
protocol

Fixed duplicated code, same as last commit.

One could send a malformed packet that caused the server to SEGV.  In 
recent versions of the password protocol, the client tells the server 
what length the ciphertext is (almost always 20).  If that length was
large enough to overflow a signed char, then the number would jump to 
very large after being casted to unsigned int.

Instead, cast the *passwd char to uchar.
 2007-06-12 08:47:36 -04:00
gkodinov/kgeorge@magare.gmz
2a6ac40e11 removed compilation warning 2007-06-12 14:45:30 +03:00
gkodinov/kgeorge@magare.gmz
32d9644489 Merge bk-internal:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B28992-5.0-opt
 2007-06-12 14:37:14 +03:00
gkodinov/kgeorge@magare.gmz
5ea9964b9f Bug #28992: trigger fails in pushbuild 
- fixed wrong test case for bug 20903
 - closed the dangling connections in trigger.test
 - GET_LOCK() and RELEASE_LOCK() now produce more detailed log
 - fixed an omission in GET_LOCK() : assign the thread_id when
    acquiring the lock.
 2007-06-12 14:35:36 +03:00
joerg@trift2.
bd0b478e30 VC++Files/sql/mysqld.vcproj 
Ensure ".pdb" and ".map" files are created for the MySQL server, in all configurations.
 2007-06-12 10:25:24 +02:00
gkodinov/kgeorge@magare.gmz
0fa279e5e2 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B28934-5.0-opt
 2007-06-12 11:11:12 +03:00
gkodinov/kgeorge@magare.gmz
b9876c6e9c Bug #28934: server crash when receiving malformed com_execute packets 
Sometimes a parameter slot may not get a value because of the protocol
 data being plain wrong.
 Such cases should be detected and handled by returning an error.
 Fixed by checking data stream constraints where possible (like maximum
 length) and reacting to the case where a value cannot be constructed.
 2007-06-12 11:02:34 +03:00
kaa@polly.local
780a3dae0c Merge polly.local:/home/kaa/src/maint/bug28895/my50-bug28895 
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
 2007-06-12 11:42:39 +04:00
kent@mysql.com/c-554072d5.010-2112-6f72651.cust.bredbandsbolaget.se
425bbb3264 libmysqld.def: 
Corrected name of mysql_thread_{init,end} (bug#29007)
 2007-06-12 01:33:23 +02:00
evgen@moonbone.local
4cdbe25a6b Bug#28904: INSERT .. ON DUPLICATE was silently updating rows when it shouldn't. 
When the INSERT .. ON DUPLICATE KEY UPDATE has to update a matched row but
the new data is the same as in the record then it returns as if
no rows were inserted or updated. Nevertheless the row is silently
updated. This leads to a situation when zero updated rows are reported 
in the case when data has actually been changed.

Now the write_record function updates a row only if new data differs from
that in the record.
 2007-06-12 01:41:23 +04:00
kaa@polly.local
0f5a1e5910 Fix for bug #29015 "Stack overflow in processing temporary table name when tmpdir path is long" 
In create_tmp_table() don't set full table path as a table name. Other code assumes table names to not exceed NAME_LEN bytes.
 2007-06-11 23:06:20 +04:00
malff/marcsql@weblab.(none)
046e489bc5 Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base 
into  weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge
 2007-06-11 11:32:10 -06:00
istruewing@chilla.local
2e8cea5a5a Merge chilla.local:/home/mydev/mysql-4.1-axmrg 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2007-06-11 17:40:53 +02:00
istruewing@chilla.local
86f495d53c Merge chilla.local:/home/mydev/mysql-5.0-amain 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2007-06-11 17:40:01 +02:00
lars/lthalmann@dl145j.mysql.com
c35447dd12 Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
 2007-06-11 16:48:05 +02:00
lars/lthalmann@dl145j.mysql.com
f22f72078b Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
 2007-06-11 16:46:46 +02:00
lars/lthalmann@dl145k.mysql.com
2112634685 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
 2007-06-11 16:42:24 +02:00
lars/lthalmann@mysql.com/dl145k.mysql.com
4829d2f6ce Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
 2007-06-11 16:41:46 +02:00
istruewing@chilla.local
491e9d2292 Merge chilla.local:/home/mydev/mysql-4.1-amain 
into  chilla.local:/home/mydev/mysql-4.1-axmrg
 2007-06-11 16:24:29 +02:00
joerg@trift2.
07785ec533 Merge trift2.:/MySQL/M41/push-4.1 
into  trift2.:/MySQL/M50/push-5.0
 2007-06-11 15:54:05 +02:00
df@pippilotta.erinye.com
6f8a8a56ea Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
 2007-06-11 09:53:57 +02:00
lars/lthalmann@dl145k.mysql.com
d798f52aa0 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
 2007-06-11 09:44:15 +02:00
kent@mysql.com/c-554072d5.010-2112-6f72651.cust.bredbandsbolaget.se
665c32a4ac mysqldemb.vcproj: 
Added lots of missing files to make "mysqlserver.lib" complete (bug#29007)
mysql.sln:
  Let 'mysqlserver' project also depend on 'vio', else "vio.lib" will
  not be linked into the "mysqlserver.lib" static embedded lib (bug#29007)
 2007-06-10 19:07:18 +02:00
gluh@mysql.com/eagle.(none)
c25c178112 compiler warning fix 2007-06-09 18:18:34 +05:00
gluh@eagle.(none)
4af938a148 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
 2007-06-09 17:46:34 +05:00
gluh@mysql.com/eagle.(none)
068f1f7dbf Bug#28149 overflow in some "SHOW STATUS"-variables 
changed bytes_received, bytes_sent status variables to longlong
 2007-06-09 17:46:09 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
e570a72b13 Fix for bug #28748: "Select" returning one value too few 
Problem: we may get unexpected results comparing [u]longlong values as doubles.
Fix: adjust the test to use integer comparators.
Note: it's not a real fix, we have to implement some new comparators 
to completely solve the original problem (see my comment in the bug report).
 2007-06-09 17:13:33 +05:00
holyfoot/hf@hfmain.(none)
c528084a9f Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/home/hf/work/28333/my50-28333
 2007-06-09 16:52:38 +05:00
gluh@mysql.com/eagle.(none)
47ecabe915 Bug#28266 IS_UPDATABLE field on VIEWS table in I_S database is wrong 
IS_UPDATABLE flag is set to 'yes' when the view has at least one updatable column and
the algorithm is not 'temporary'.
 2007-06-09 16:52:37 +05:00
holyfoot/hf@hfmain.(none)
c55e9c5f4f Merge bk@192.168.21.1:mysql-5.0-opt 
into  mysql.com:/home/hf/work/28333/my50-28333
 2007-06-09 15:56:04 +05:00
gkodinov/kgeorge@magare.gmz
241c49c6b9 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B28754-5.0-opt
 2007-06-09 09:02:21 +03:00
cmiller@zippy.cornsilk.net
f0dd5d9cf1 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/41gca 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint-2
 2007-06-08 17:06:29 -04:00
cmiller@zippy.cornsilk.net
3ab51acf6a Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
 2007-06-08 16:52:40 -04:00
cmiller@zippy.cornsilk.net
a46744a49b Merge zippy.cornsilk.net:/home/cmiller/work/mysql/41gca 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-release
 2007-06-08 16:28:48 -04:00
cmiller@zippy.cornsilk.net
4584ac2c73 Bug #28984: crasher on connect with out of range password length in \ 
protocol

One could send a malformed packet that caused the server to SEGV.  In 
recent versions of the password protocol, the client tells the server 
what length the ciphertext is (almost always 20).  If that length was
large enough to overflow a signed char, then the number would jump to 
very large after being casted to unsigned int.

Instead, cast the *passwd char to uchar.
 2007-06-08 16:10:53 -04:00
holyfoot/hf@mysql.com/hfmain.(none)
96d07631b2 Bug #28333 Test "flush" tries to create a new thread - on only one platform 
on PPC/Debian Linux default stack size for a thread is too big.
As we use default thread settings in mysqltest, the
thread creation fails if we create lots of threads (as it
happens in flush.test). So now stack size is explicitly specified
for the mysqltest
 2007-06-09 00:39:23 +05:00
igor@olga.mysql.com
e2e672b56d Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug28811
 2007-06-08 09:59:07 -07:00
joerg@trift2.
2d718ff1c2 Add a cast, needed by some platforms. 
Still part of the fix for bug#27078.
 2007-06-08 17:02:48 +02:00
msvensson@pilot.(none)
32eff42f73 Turn off use of bin log when running with embedded server 2007-06-08 16:20:24 +02:00