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

51319 commits

This branch
This branch
All branches
Author SHA1 Message Date
malff@lambda.hsd1.co.comcast.net.
fc76a4824a Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-base 
into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-rt-merge
 2007-11-27 09:03:04 -07:00
mkindahl@dl145h.mysql.com
b1428496df Disabling several tests that fail and reported as errors. 2007-11-27 11:02:00 +01:00
msvensson@pilot.mysql.com
ec08b4a405 Remove disabling of testcases 2007-11-26 20:05:52 +01:00
msvensson@pilot.mysql.com
f45cf3e975 Bug#25146 Some warnings/errors not shown when using --show-warnings 
- Additional patch to fix compiler warnings
 2007-11-26 19:50:43 +01:00
msvensson@pilot.mysql.com
385e3a895e Revert 2007-11-26 19:42:07 +01:00
thek@adventure.(none)
8d065eac6d Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
 2007-11-26 19:33:01 +01:00
thek@adventure.(none)
da93d2b363 Merge adventure.(none):/home/thek/Development/cpp/bug16470/my51-bug16470 
into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
 2007-11-26 19:31:41 +01:00
davi@endora.local
36d3c604c1 Merge mysql.com:/Users/davi/mysql/bugs/29592-5.0 
into  mysql.com:/Users/davi/mysql/bugs/29592-5.1
 2007-11-26 16:10:26 -02:00
thek@adventure.(none)
345650212c Bug#16470 crash on grant if old grant tables 
Loading 4.1 into 5.0 or 5.1 failed silently because procs_priv table missing.
This caused the server to crash on any attempt to store new grants because
of uninitialized structures.

This patch breaks up the grant loading function into two phases to allow
for procs_priv table to fail with an warning instead of crashing the server.
 2007-11-26 19:09:40 +01:00
davi@mysql.com/endora.local
cdad8669df Bug#29592 SQL Injection issue 
Remove the mysql_odbc_escape_string() function. The function
has multi-byte character escaping issues, doesn't honor the
NO_BACKSLASH_ESCAPES mode and is not used anymore by the
Connector/ODBC as of 3.51.17.
 2007-11-26 14:09:37 -02:00
msvensson@pilot.mysql.com
702361735a Fix warning about possibly uninitialized variable "warnings" 2007-11-26 16:45:58 +01:00
msvensson@pilot.mysql.com
7c739af321 Merge bk-internal:/home/bk/mysql-5.1-rpl-merge 
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl-merge
 2007-11-26 16:42:19 +01:00
msvensson@pilot.mysql.com
16d372ce7d Add suppressions for expected warning messages that appears in 
slave's error log when running rpl_extraColmaster_*.test
 2007-11-26 16:31:35 +01:00
mkindahl@dl145h.mysql.com
3f1c8ab526 Disabling testcases that have warnings that PB cannot handle. 2007-11-26 16:20:37 +01:00
msvensson@pilot.mysql.com
da8ca56667 Disable combinations processing until next version 2007-11-26 16:19:34 +01:00
thek@adventure.(none)
a0be47a740 Merge adventure.(none):/home/thek/Development/cpp/bug32436/my51-bug32436 
into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
 2007-11-26 15:59:09 +01:00
thek@adventure.(none)
ce98e49635 Merge adventure.(none):/home/thek/Development/cpp/bug32436/my50-bug32436 
into  adventure.(none):/home/thek/Development/cpp/bug32436/my51-bug32436
 2007-11-26 15:45:13 +01:00
thek@adventure.(none)
95bfde3d01 Bug #32436 KILL QUERY completely deadlocks mysqld 
Sending several "KILL QUERY" statements to target a connection running
"SELECT SLEEP" could freeze the server.

The locking order in Item_func_sleep was wrong and this could lead to a
dead lock.

This patch solves the issue by resolving the locking order properly.
 2007-11-26 15:44:05 +01:00
mkindahl@dl145h.mysql.com
ebbcf7a6e2 Disabling failing test that has been reported as bug. 2007-11-26 15:36:23 +01:00
kostja@bodhi.(none)
29453e56ae Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
 2007-11-23 16:36:28 +03:00
kostja@bodhi.(none)
a80bf5df44 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
 2007-11-23 16:26:30 +03:00
mkindahl@dl145h.mysql.com
93d9d62353 Post-merge fixes. 2007-11-23 12:51:14 +01:00
mkindahl@dl145h.mysql.com
29e48c4f63 Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
 2007-11-22 20:15:42 +01:00
df@pippilotta.erinye.com
bf6cf069f1 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
 2007-11-22 18:07:09 +01:00
davi@endora.local
9e88b83b87 Merge darnaut@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  endora.local:/Users/davi/mysql/mysql-5.1-runtime
 2007-11-22 11:10:18 -02:00
davi@endora.local
d2a3ed8d16 Merge endora.local:/Users/davi/mysql/bugs/32528-5.0 
into  endora.local:/Users/davi/mysql/mysql-5.1-runtime
 2007-11-22 10:32:34 -02:00
davi@endora.local
9817d93edb Merge endora.local:/Users/davi/mysql/bugs/32528-5.0 
into  endora.local:/Users/davi/mysql/mysql-5.0-runtime
 2007-11-22 10:20:12 -02:00
davi@endora.local
351c474153 Bug#32528 Global read lock with a low priority write lock causes a server crash 
FLUSH TABLES WITH READ LOCK fails to properly detect write locked
tables when running under low priority updates.

The problem is that when trying to aspire a global read lock, the
reload_acl_and_cache() function fails to properly check if the thread
has a low priority write lock, which later my cause a server crash or
deadlock.

The solution is to simple check if the thread has any type of the
possible exclusive write locks.
 2007-11-22 10:18:19 -02:00
kostja@bodhi.(none)
42e65481f8 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
 2007-11-22 14:58:58 +03:00
kostja@bodhi.(none)
c9d81cabd3 Add a test case for Bug#29817. The bug was fixed by the patch for 
Bug#28318.
 2007-11-22 14:48:03 +03:00
malff@lambda.hsd1.co.comcast.net.
1f4cff2863 Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-base 
into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-rt-merge
 2007-11-21 18:42:15 -07:00
malff@lambda.hsd1.co.comcast.net.
d7a7f2f183 Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-base 
into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-rt-merge
 2007-11-21 18:35:02 -07:00
kostja@bodhi.(none)
04bf5743b4 Update the failing kill test in the team tree. 2007-11-22 03:48:51 +03:00
mkindahl@dl145h.mysql.com
0c7f3bdeba Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
 2007-11-21 21:15:33 +01:00
thek@adventure.(none)
13be72f9c3 Merge adventure.(none):/home/thek/Development/cpp/bug31153/my51-bug31153 
into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
 2007-11-21 20:57:28 +01:00
df@pippilotta.erinye.com
9d8981033d Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-11-21 19:44:40 +01:00
df@pippilotta.erinye.com
f67a748ab4 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-11-21 19:44:12 +01:00
df@pippilotta.erinye.com
8c88e1faa2 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-11-21 19:42:50 +01:00
df@pippilotta.erinye.com
cf7b21c005 add wrong warning to suppression file 2007-11-21 19:41:13 +01:00
df@pippilotta.erinye.com
ca249707a1 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-11-21 19:33:27 +01:00
mleich@five.local.lan
2bc3dba9c8 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  five.local.lan:/work/trees/mysql-5.0-build-src-clean
 2007-11-21 18:55:27 +01:00
df@pippilotta.erinye.com
c25cbcec13 ignore readline warnings 2007-11-21 18:11:08 +01:00
mleich@five.local.lan
6ffbe3d076 Merge five.local.lan:/work/merge/mysql-5.0-build-30418 
into  five.local.lan:/work/merge/mysql-5.1-build-31610
 2007-11-21 15:06:38 +01:00
mleich@five.local.lan
4922727fb7 This changeset fixes 
Bug#31567 "datadict" tests (all engines) fail:
             Reference protocol is non-standard build
   Bug#30418 "datadict" tests (all engines) fail:
             Dependency on the host name for ordering   
Modifications:
   1. The standard builds (build team) do not contain
      the collation 'utf8_general_cs'.
      The common developer builds (compuile-....-max)
      contain this collation.
      Solution fitting to both build variants:
         Exclude the collation 'utf8_general_cs' from
         result sets.
   2. Use mysqltest builtin sorting of result set for
      the statement where the hostname affects the
      row order.
 2007-11-21 13:50:17 +01:00
thek@adventure.(none)
7580f9043a Merge adventure.(none):/home/thek/Development/cpp/bug31153/my50-bug31153 
into  adventure.(none):/home/thek/Development/cpp/bug31153/my51-bug31153
 2007-11-21 11:25:17 +01:00
thek@adventure.(none)
0b38e67453 Merge adventure.(none):/home/thek/Development/cpp/bug31153/my50-bug31153 
into  adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime
 2007-11-21 10:02:44 +01:00
tsmith@ramayana.hindu.god
56b9199ba3 Merge ramayana.hindu.god:/home/tsmith/m/bk/build/b25146/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51
 2007-11-20 20:35:14 -07:00
davi@endora.local
eb0ffb4cc8 Merge endora.local:/Users/davi/mysql/mysql-5.0-runtime 
into  endora.local:/Users/davi/mysql/mysql-5.1-runtime
 2007-11-20 22:12:38 -02:00
tsmith@ramayana.hindu.god
6a193c5528 Bug #25146: Some warnings/errors not shown when using --show-warnings 
In several cases, an error when processing the query would cause mysql to
return to the top level without printing warnings.  Fix is to always
print any available warnings before returning to the top level.
 2007-11-20 17:03:56 -07:00
davi@endora.local
3d31d4bc45 Merge endora.local:/Users/davi/mysql/bugs/17244-5.1 
into  endora.local:/Users/davi/mysql/mysql-5.1-runtime
 2007-11-20 18:04:58 -02:00