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
49,993 Commits 3,273 Branches 1,096 Tags
b75eb1ee3e91dbbd7be78bf3a1e18a07642c4c1c
Commit Graph

19659 Commits

Author SHA1 Message Date
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
gluh@mysql.com/eagle.(none)
7a8fd4107d Bug#27629 Possible security flaw in INFORMATION_SCHEMA and SHOW statements 
added SUPER_ACL check for I_S.TRIGGERS
 2007-08-20 11:23:08 +05:00
tsmith@ramayana.hindu.god
76d173fa9d Bug #29307: status.test fails with different Table_locks_immediate 
Finish premature patch which was accidentally pushed; remove debugging
info and correct the test.
 2007-08-18 02:28:08 -06:00
tsmith@ramayana.hindu.god
a7b5c540ba Merge ramayana.hindu.god:/home/tsmith/m/bk/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-08-18 00:36:18 -06:00
tsmith@ramayana.hindu.god
88444351c2 Merge ramayana.hindu.god:/home/tsmith/m/bk/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2007-08-18 00:35:41 -06:00
tsmith@ramayana.hindu.god
c23b736ed3 Bug #29307: status.test fails with different Table_locks_immediate 
When using --log --log-output=table, we increment Table_locks_immediate
with every query.  The wait_condition.inc runs a query a variable number
of times, depending on server load, etc.  This is a problem, when the
test is checking the Table_locks_immediate value.

Fix is to adjust the Table_locks_immediate value based on how many times
the wait_condition query was executed.
 2007-08-17 19:29:08 -06:00
jmiller/ndbdev@ndb08.mysql.com
089c2aa27c 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-17 19:53:22 +02:00
jmiller/ndbdev@mysql.com/ndb08.mysql.com
76d61416ef rpl_packet.test: 
Removed sleep from test per lars request
 2007-08-17 19:51:25 +02:00
thek@adventure.(none)
4b6c103f09 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-17 17:34:18 +02:00
thek@adventure.(none)
35533f9d8f Merge adventure.(none):/home/thek/Development/cpp/bug30269/my50-bug30269 
into  adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime
 2007-08-17 17:27:41 +02:00
thek@adventure.(none)
c12feca450 Merge adventure.(none):/home/thek/Development/cpp/bug30269/my51-bug30269 
into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
 2007-08-17 17:26:38 +02:00
thek@adventure.(none)
5d5519edde Merge adventure.(none):/home/thek/Development/cpp/bug30269/my50-bug30269 
into  adventure.(none):/home/thek/Development/cpp/bug30269/my51-bug30269
 2007-08-17 16:59:20 +02:00
thek@adventure.(none)
a4248c2dd3 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.
 2007-08-17 16:55:20 +02:00
davi@moksha.local
a63738db6c Bug#25856 (HANDLER table OPEN in one connection lock DROP TABLE in another one) 
mysql_ha_open calls mysql_ha_close on the error path (unsupported) to close the (opened) table before inserting it into the tables hash list handler_tables_hash) but mysql_ha_close only closes tables which are on the hash list, causing the table to be left open and locked.

This change moves the table close logic into a separate function that is always called on the error path of mysql_ha_open or on a normal handler close (mysql_ha_close).
 2007-08-17 11:34:12 -03:00
evgen@moonbone.local
9a83ddda69 Bug#30245: A wrong type of a BIT field is reported when grouped by it. 
HEAP tables can't index BIT fields. Due to this when grouping by such fields is
needed they are converted to a fields of the LONG type when temporary table
is being created. But a side effect of this is that a wrong type of BIT
fields is returned to a client.

Now the JOIN::prepare and the create_distinct_group functions are create
additional hidden copy of BIT fields to preserve original fields untouched.
New hidden fields are used for grouping instead.
 2007-08-17 18:30:41 +04:00
igor@olga.mysql.com
3d44204e84 Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug30396
 2007-08-16 21:04:28 -07:00
gni@dev3-221.dev.cn.tlan
ed539e10f2 Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj 
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug22240
 2007-08-17 11:44:51 +08:00
gni@dev3-221.dev.cn.tlan
badda4b7b6 BUG#22240 Add a test case into ndb_restore_compat 2007-08-17 11:41:32 +08:00
igor@olga.mysql.com
37f3a92a42 Post-merge fix. 2007-08-16 19:27:44 -07:00
igor@olga.mysql.com
ff3f6e806b Merge olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug30396 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.1-opt-bug30396
 2007-08-16 17:22:50 -07:00
jbruehe/mysqldev@mysql.com/production.mysql.com
7f21134826 Merge bk-internal:/home/bk/mysql-5.1-marvel 
into  mysql.com:/data0/mysqldev/my/build-200708161639-5.1.21-beta/mysql-5.1-release
 2007-08-16 21:56:47 +02:00
jbruehe/mysqldev@mysql.com/production.mysql.com
2d4efab366 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel 
into  mysql.com:/data0/mysqldev/my/mysql-5.1-30367
 2007-08-16 18:21:47 +02:00
lars/lthalmann@mysql.com/dl145k.mysql.com
aba3a3b49d Post-merge fix of error number 2007-08-16 17:26:32 +02:00
monty@mysql.com/narttu.mysql.fi
9b6b53f0d0 Fixed errors found by pushbuild: 
Fixed failing func_misc test for embedded server
Added casts to avoid compiler warnings
Removed Table_locks_immediate as it's depending on log file cacheing
Changed type of get_time() to avoid warnings
Removed testing if purger master logs succeded as this is not deterministic
 2007-08-16 16:47:31 +03:00
mhansson@dl145s.mysql.com
4fdadd620d Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  dl145s.mysql.com:/data0/mhansson/my50-bug28570
 2007-08-16 14:13:07 +02:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
01884a431f Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb 
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj.merge
 2007-08-16 11:12:05 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
921cba22bc Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/mysql-5.0-ndb 
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/mysql-5.0-ndb-bj.merge
 2007-08-16 11:06:41 +08:00
tsmith@ramayana.hindu.god
a5fdd2332b Merge ramayana.hindu.god:/home/tsmith/m/bk/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-08-15 15:48:57 -06:00
tsmith@ramayana.hindu.god
e2d64f2878 Merge ramayana.hindu.god:/home/tsmith/m/bk/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2007-08-15 15:48:03 -06:00
mleich@four.local.lan
1ed59fb50d Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  four.local.lan:/WORK/merge/mysql-5.1-WL3982
 2007-08-15 22:04:55 +02:00
mleich@four.local.lan
babfbd03d9 This changeset is result of 
WL#3982 Test information_schema.processlist
and replaces the corresponding tests pushed to
     mysql-test-extra-5.1/mysql-test/qa-suite/info_schema
 2007-08-15 21:46:44 +02:00
lars/lthalmann@dl145k.mysql.com
2c893c14da Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-08-15 21:30:45 +02:00
lars/lthalmann@dl145k.mysql.com
4000c96a70 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
 2007-08-15 21:26:47 +02:00
igor@olga.mysql.com
d790ec42e1 Fixed bug #30396. 
The bug caused memory corruption for some queries with top OR level
in the WHERE condition if they contained equality predicates and 
other sargable predicates in disjunctive parts of the condition.

The corruption happened because the upper bound of the memory
allocated for KEY_FIELD and SARGABLE_PARAM internal structures
containing info about potential lookup keys was calculated incorrectly
in some cases. In particular it was calculated incorrectly when the
WHERE condition was an OR formula with disjuncts being AND formulas
including equalities and other sargable predicates.
 2007-08-15 10:24:18 -07:00