database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-13 21:42:58 +03:00
Code Activity
50,657 Commits 3,273 Branches 1,096 Tags
fdff4ff141e11d0feec10cd73c5459ea9d007bd7
Commit Graph

20047 Commits

Author SHA1 Message Date
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
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
2cb4a2c0b6 Removed a test which output may differ depending on machine load. 2007-08-22 16:18:27 +03:00
aelkin/elkin@dsl-hkibras-fe38f900-157.dhcp.inet.fi
d4192c14ad bug#23333 
fixing the test due a to different offsets in binlog with ps-protocol (a possible bug to be reported)
 2007-08-22 15:43:16 +03:00
aelkin/elkin@dsl-hkibras-fe38f900-157.dhcp.inet.fi
81be50576f bug#27417 
refining of cleanup of the tests.
 2007-08-22 10:40:38 +03: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.
ab7e096b68 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-21 18:42:35 +02: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
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
tomas@whalegate.ndb.mysql.com
88fa8c267b rpl_ndb_dd_partitions-slave.opt: 
Rename: mysql-test/t/rpl_ndb_dd_partitions-slave.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions-slave.opt
.del-rpl_stm_extraColmaster_ndb.result:
  Delete: mysql-test/r/rpl_stm_extraColmaster_ndb.result
.del-rpl_extraColmaster_myisam.test:
  Delete: mysql-test/t/rpl_extraColmaster_myisam.test
ndb_bug26793.result:
  Rename: mysql-test/r/ndb_bug26793.result -> mysql-test/suite/ndb/r/ndb_bug26793.result
.del-rpl_extraColmaster_innodb-slave.opt:
  Delete: mysql-test/t/rpl_extraColmaster_innodb-slave.opt
.del-rpl_extraColmaster_innodb-master.opt:
  Delete: mysql-test/t/rpl_extraColmaster_innodb-master.opt
.del-rpl_row_extraColmaster_ndb.test:
  Delete: mysql-test/t/rpl_row_extraColmaster_ndb.test
.del-rpl_row_extraColmaster_ndb.result:
  Delete: mysql-test/r/rpl_row_extraColmaster_ndb.result
.del-rpl_stm_extraColmaster_ndb.test:
  Delete: mysql-test/t/rpl_stm_extraColmaster_ndb.test
.del-rpl_extraColmaster_innodb.test:
  Delete: mysql-test/t/rpl_extraColmaster_innodb.test
ndb_bug26793.test:
  Rename: mysql-test/t/ndb_bug26793.test -> mysql-test/suite/ndb/t/ndb_bug26793.test
rpl_ndb_dd_partitions-master.opt:
  Rename: mysql-test/t/rpl_ndb_dd_partitions-master.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions-master.opt
.del-rpl_colSize.test~d9690ba9ffd2b048:
  Delete: mysql-test/t/rpl_colSize.test
 2007-08-21 16:26:00 +02: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
tomas@whalegate.ndb.mysql.com
166849188d manual merge 2007-08-21 14:41:50 +02:00
aelkin/elkin@dsl-hkibras-fe38f900-157.dhcp.inet.fi
77998c30c2 Bug #23333 stored function + non-transac table + transac table = breaks stmt-based binlog 
Binlogging of the statement with a side effect like a modified non-trans table did not happen.
The artifact involved all binloggable dml queries.

Fixed with changing the binlogging conditions all over the code to exploit thd->transaction.stmt.modified_non_trans_table
introduced by the patch for bug@27417.

Multi-delete case has own specific addressed by another bug@29136. Multi-update case has been addressed by bug#27716 and
patch and will need merging.
 2007-08-21 15:16:55 +03: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
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
malff/marcsql@weblab.(none)
c76cd081d8 Fixed 5.0 -> 5.1 merge 2007-08-20 17:50:42 -06:00
malff/marcsql@weblab.(none)
a01da34f72 Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-runtime 
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt50-merge
 2007-08-20 16:13:54 -06:00
brian@piggy.tangent.org
0ffc10463a Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch 
into  piggy.tangent.org:/home/mysql/trees/mysql-5.1-arch
 2007-08-20 13:25:53 -07:00
baker@bk-internal.mysql.com
9977898bd7 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2007-08-20 22:25:52 +02:00
brian@piggy.tangent.org
e00b72de19 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch 
into  piggy.tangent.org:/home/mysql/trees/mysql-5.1-arch
 2007-08-20 13:18:40 -07:00
brian@piggy.tangent.org
bd0bcb70f5 Extending tests for detach (found a memory issue in it, this fixes that and now tests it). 2007-08-20 13:03:50 -07:00
malff/marcsql@weblab.(none)
1c27dd1d67 Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base 
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge
 2007-08-20 11:13:31 -06:00
malff/marcsql@weblab.(none)
8d507c5897 Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base 
into  weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge
 2007-08-20 10:45:16 -06:00
jmiller/ndbdev@ndb08.mysql.com
3500810898 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  mysql.com:/data2/mysql-5.1-new-rpl-30128-30209
 2007-08-20 15:23:26 +02:00
msvensson@pilot.(none)
0b8d2a92b1 Merge 192.168.0.7:mysql/mysql-5.1-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-08-20 15:15:44 +02:00
msvensson@shellback.(none)
cbecd2007e Make it possible to pass mysql-test-run.pl test cases to run 
also on the <suite>.<testname> format
 2007-08-20 15:12:14 +02:00
msvensson@pilot.(none)
346e565981 Merge bk-internal:/home/bk/mysql-5.1-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-08-20 13:48:46 +02:00
msvensson@pilot.(none)
6d00495cbb Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
 2007-08-20 13:48:27 +02:00
msvensson@pilot.(none)
2b8218d334 Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-08-20 13:48:04 +02:00
msvensson@pilot.(none)
d2fdcd908a Merge pilot.(none):/data/msvensson/mysql/work/my51-work 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-08-20 13:47:31 +02:00
msvensson@pilot.(none)
f773863767 Merge pilot.(none):/data/msvensson/mysql/work/my50-work 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
 2007-08-20 13:46:57 +02:00
msvensson@pilot.(none)
0b80907150 Only install second master db if using second master 2007-08-20 13:46:42 +02:00
msvensson@pilot.(none)
cd7fdee0f7 Merge pilot.(none):/data/msvensson/mysql/work/my50-work 
into  pilot.(none):/data/msvensson/mysql/work/my51-work
 2007-08-20 13:45:32 +02:00
lzhou/zhl@dev3-63.(none)
804684c292 Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb-bj 
into  dev3-63.(none):/home/zhl/mysql/mysql-5.0/bug29674
 2007-08-20 10:59:14 +00:00
lzhou/zhl@dev3-63.(none)
d48067537b BUG#29674 add install data of the new test case in makefile.am 2007-08-20 10:47:09 +00:00
skozlov/ksm@mysql.com/virtop.localdomain
cb6375eda1 Bug#29363 2007-08-20 13:24:37 +04:00
skozlov/ksm@mysql.com/virtop.localdomain
8a81bd4749 rpl.rpl_innodb_mixed_dml enabled 2007-08-20 12:31:21 +04:00
gluh@eagle.(none)
6dda1f8be1 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
 2007-08-20 11:25:45 +05:00