mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 14:02:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
49543 commits 2781 branches 343 tags 1.6 GiB
Commit graph

49543 commits

This branch
This branch
All branches
Author SHA1 Message Date
skozlov/ksm@mysql.com/virtop.localdomain
7094223ea2 Bug#28744, Bug#29363 2007-08-23 17:33:06 +04:00
jmiller/ndbdev@ndb08.mysql.com
af68cdb2a8 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-target-5.1.22 
into  mysql.com:/data1/mysql-5.1-target-5.1.22
 2007-08-23 15:33:05 +02:00
tomas@whalegate.ndb.mysql.com
749b40612e BUG#30134 restore of backup from different endian can work for timestamp column 
(recommit for 5.1.22 target)
 2007-08-23 15:17:44 +02:00
joerg@trift2.
18b8e7a33f Cleanup in the "netware" subdirectory: 
1) We do not provide the "isam" table handler in 5.0 and up (different from "myisam" !),
   so we do not need the ".def" files for the "isam"-specific tools.

2) Use "basename" to get the base name of a file, not a harder-to-read sed expression.
 2007-08-22 22:04:31 +02:00
joerg@trift2.
94e9aa8eb1 Merge trift2.:/MySQL/M51/target-5.1.22 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-22 19:52:30 +02:00
gshchepa/uchum@gleb.loc
3608dbdc66 Merge gleb.loc:/home/uchum/work/bk/5.0-opt-30201 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-08-22 22:26:46 +05:00
gshchepa/uchum@gleb.loc
16e0a4de56 Merge gleb.loc:/home/uchum/work/bk/5.0-opt-30201 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
 2007-08-22 22:23:03 +05:00
antony@pcg5ppc.xiphis.org
c7cf3e05b5 Bug#30359 
"Test federated_bug_25714 issues non-existing shell command"
  Problem caused by missing '$' symbol in eval statement causing it
  to always attempt to run test even if the test was not compiled.
 2007-08-22 10:15:20 -07:00
joerg@trift2.
8fbb89e831 Raise the version number to 5.1.23, 
because we already split off a tree for 5.1.22 to receive only selected fixes.
 2007-08-22 17:32:35 +02:00
joerg@trift2.
1f9a4adda6 Correct an erroneous manual merge. 2007-08-22 17:25:31 +02:00
joerg@trift2.
d4d4f8528e Manual merge of parallel development in separate team trees. 2007-08-22 17:13:42 +02:00
jani@hynda.mysql.fi
ca3b3d3fd0 Merge hynda.mysql.fi:/home/my/mysql-5.0-marvel 
into  hynda.mysql.fi:/home/my/mysql-5.1-marvel
 2007-08-22 18:02:00 +03:00
jani@hynda.mysql.fi
6519de0469 Merge hynda.mysql.fi:/home/my/mysql-5.1-main 
into  hynda.mysql.fi:/home/my/mysql-5.1-marvel
 2007-08-22 17:29:38 +03:00
joerg@trift2.
20ce606797 Merge trift2.:/MySQL/M51/target-5.1.22 
into  trift2.:/MySQL/M51/push-5.1

Includes manual merges.
 2007-08-22 16:08:55 +02:00
joerg@trift2.
e33ff1c708 Fix the version number. 2007-08-22 15:58:03 +02:00
jmiller/ndbdev@mysql.com/ndb08.mysql.com
a36530ed5a ndb_dd_ddl.test, ndb_dd_ddl.result: 
Updated test case to correst inconsistant results on different OS per #bug30559
 2007-08-22 15:54:10 +02:00
joerg@trift2.
36cba7ce09 Merge trift2.:/MySQL/M51/clone-5.1 
into  trift2.:/MySQL/M51/target-5.1.22
 2007-08-22 15:49:00 +02:00
joerg@trift2.
057c591e29 Merge trift2.:/MySQL/M51/target-5.1.22 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-22 15:43:01 +02:00
jani@hynda.mysql.fi
28b2b89013 Merge hynda.mysql.fi:/home/my/mysql-5.0-main 
into  hynda.mysql.fi:/home/my/mysql-5.0-marvel
 2007-08-22 16:19:06 +03:00
jani@hynda.mysql.fi
2cb4a2c0b6 Removed a test which output may differ depending on machine load. 2007-08-22 16:18:27 +03:00
gshchepa/uchum@gleb.loc
f3d0f62d10 Fixed bug #30201. 
Killing a SELECT query with KILL QUERY or KILL CONNECTION
causes a server crash if the query cache is enabled.

Normal evaluation of a query may be interrupted by the
KILL QUERY/CONNECTION statement, in this case the mysql_execute_command
function returns TRUE, and the thd->killed flag has true value.
In this case the result of the query may
be cached incompletely (omitting call to query_cache_insert inside
the net_real_write function), and next call to query_cache_end_of_result
may lead to server crash.
Thus, the query_cache_end_of_result function has been modified to abort
query cache in the case of killed thread.
 2007-08-22 18:15:54 +05:00
jmiller/ndbdev@mysql.com/ndb08.mysql.com
630563d50e ndb_dd_dump.test, ndb_dd_dump.result: 
uncommented the test case stated in bug18856 and commiting to mysql-5.1-target-5.1.22 clone per Tomas
 2007-08-21 21:22:35 +02:00
joerg@trift2.
d5d209dd69 Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-21 18:45:36 +02:00
joerg@trift2.
ab7e096b68 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-21 18:42:35 +02:00
joerg@trift2.
cd1561d5a8 Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-08-21 18:24:01 +02:00
jani@hynda.mysql.fi
f8db7bac5b Merge hynda.mysql.fi:/home/my/mysql-5.0-marvel 
into  hynda.mysql.fi:/home/my/mysql-5.1-marvel
 2007-08-21 19:09:46 +03:00
jani@hynda.mysql.fi
bca8c4d353 Merge hynda.mysql.fi:/home/my/mysql-5.0-main 
into  hynda.mysql.fi:/home/my/mysql-5.0-marvel
 2007-08-21 19:06:47 +03:00
jani@hynda.mysql.fi
2fd7a743e4 Merge hynda.mysql.fi:/home/my/mysql-5.1-main 
into  hynda.mysql.fi:/home/my/mysql-5.1-marvel
 2007-08-21 19:03:28 +03:00
gshchepa/uchum@gleb.loc
86768df764 Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
 2007-08-21 20:56:40 +05:00
gshchepa/uchum@gleb.loc
5b11e62613 Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-08-21 20:52:53 +05:00
thek@adventure.(none)
88107378cd Merge adventure.(none):/home/thek/Development/cpp/bug30269/my50-bug30269 
into  adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime
 2007-08-21 17:47:06 +02:00
gshchepa/uchum@gleb.loc
f5f65c40f1 Merge gleb.loc:/home/uchum/work/bk/5.0-opt-30287 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-08-21 19:46:29 +05:00
gshchepa/uchum@gleb.loc
c652d3df95 Merge gleb.loc:/home/uchum/work/bk/5.0-opt-30287 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
 2007-08-21 19:30:32 +05:00
gluh@eagle.(none)
c80e91d32e Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-08-21 19:05:33 +05:00
gluh@mysql.com/eagle.(none)
4446fd4b0d compiler warning fix 2007-08-21 18:59:42 +05:00
gluh@eagle.(none)
9bae69b299 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
 2007-08-21 17:57:48 +05:00
gluh@eagle.(none)
86d6897087 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-08-21 17:57:09 +05:00
gluh@mysql.com/eagle.(none)
69970f5248 Bug#27629 Possible security flaw in INFORMATION_SCHEMA and SHOW statements(addon for 5.1) 
added TRIGGER_ACL check for I_S.TRIGGERS
 2007-08-21 17:55:49 +05:00
thek@adventure.(none)
400aec95f7 Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
 2007-08-21 14:54:09 +02:00
thek@adventure.(none)
588a528f5a Merge adventure.(none):/home/thek/Development/cpp/bug30269/my51-bug30269 
into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
 2007-08-21 14:04:31 +02:00
thek@adventure.(none)
1317079fd0 Merge adventure.(none):/home/thek/Development/cpp/bug30269/my50-bug30269 
into  adventure.(none):/home/thek/Development/cpp/bug30269/my51-bug30269
 2007-08-21 13:44:01 +02:00
thek@adventure.(none)
acfe3fc924 Bug#30269 Query cache eats memory 
Although the query cache doesn't support retrieval of statements containing
column level access control, it was still possible to cache such statements
thus wasting memory.
  
This patch extends the access control check on the target tables to avoid
caching a statement with column level restrictions. 

Views are excepted and can be cached but only retrieved by super user account.
 2007-08-21 13:43:09 +02:00
gshchepa/uchum@gleb.loc
1640c5cef5 Merge gleb.loc:/home/uchum/work/bk/5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-08-21 16:40:38 +05:00
gshchepa/uchum@gleb.loc
9de070f36b Merge gleb.loc:/home/uchum/work/bk/5.1 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-08-21 16:38:29 +05:00
gshchepa/uchum@gleb.loc
4c144f6349 Merge gleb.loc:/home/uchum/work/bk/5.0 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
 2007-08-21 16:31:30 +05:00
gshchepa/uchum@gleb.loc
be6ee4314e Merge gleb.loc:/home/uchum/work/bk/5.1 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-08-21 16:16:50 +05:00
gshchepa/uchum@gleb.loc
d1b4cee88f Merge gleb.loc:/home/uchum/work/bk/5.0 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
 2007-08-21 16:14:46 +05:00
gluh@eagle.(none)
4ae4934856 Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-08-21 16:01:47 +05:00
gshchepa/uchum@gleb.loc
b9b2546a38 Merge gleb.loc:/home/uchum/work/bk/5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-08-21 14:27:06 +05:00
malff/marcsql@weblab.(none)
c76cd081d8 Fixed 5.0 -> 5.1 merge 2007-08-20 17:50:42 -06:00