mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 06:44:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
49631 commits 2781 branches 343 tags 1.6 GiB
Commit graph

49631 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
davi@moksha.local
d4aad35095 Rework doxygen documentation for the function mysql_ha_close_table. 2007-08-15 17:12:09 -03: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
lars/lthalmann@dl145h.mysql.com
db20ce753f Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-08-15 21:53:24 +02:00
lars/lthalmann@dl145h.mysql.com
0498177909 Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
 2007-08-15 21:50:38 +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
lars/lthalmann@mysql.com/dl145k.mysql.com
75925a197c Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
 2007-08-15 21:26:10 +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
kostja@bodhi.(none)
4f97c96eb2 Add replication group (comments). 2007-08-15 20:11:16 +04:00
davi@moksha.local
c290b26c0e 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-15 12:13:34 -03:00
kostja@bodhi.(none)
2537a87fb5 Provide initial module structure to Doxygen. 2007-08-15 19:08:44 +04:00
skozlov/ksm@mysql.com/virtop.localdomain
6a58417c09 fixed diff 2007-08-15 18:41:18 +04:00
evgen@moonbone.local
222fddcb79 mysql_client_test.c: 
Post fix for the bug#29948.
 2007-08-15 18:21:58 +04:00
kostja@bodhi.(none)
46b8a07dc5 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
 2007-08-15 17:46:20 +04:00
kostja@bodhi.(none)
91fe15bb9d Fix doxygen warnings. 2007-08-15 17:43:08 +04:00
skozlov/ksm@mysql.com/virtop.localdomain
32ede8aa52 disabled rpl_innodb_mixed_dml 2007-08-15 15:51:27 +04:00
joerg@trift2.
e45f07f652 Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/merge-5.1
 2007-08-15 13:25:26 +02:00
joerg@trift2.
c74b8577ee Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-08-15 12:59:51 +02:00
skozlov/ksm@mysql.com/virtop.localdomain
54e5802e5d Fixed path to tmp directory for rpl_mixed_dml.inc 2007-08-15 14:53:14 +04:00
joerg@trift2.
1d3f1985e4 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-15 12:52:47 +02:00
mhansson@dl145s.mysql.com
68048e4266 Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  dl145s.mysql.com:/data0/mhansson/my51-bug28570
 2007-08-15 12:42:39 +02:00
mhansson/martin@linux-st28.site
eb35a8764f Merge linux-st28.site:/home/martin/mysql/src/bug28570/my50-bug28570 
into  linux-st28.site:/home/martin/mysql/src/bug28570/my51-bug28570
 2007-08-15 12:03:11 +02:00
tsmith@ramayana.hindu.god
badc34bd81 Update result formatting for embedded runs of ps_1general and 
trigger tests, to match build_table_filename behavior.
 2007-08-15 02:18:41 -06:00
mhansson/martin@linux-st28.site
1da8451d4d bug#28570: handler::index_read() is called with different find_flag when 
ORDER BY is used

The range analysis module did not correctly signal to the 
handler that a range represents a ref (EQ_RANGE flag). This causes 
non-range queries like 
SELECT ... FROM ... WHERE keypart_1=const, ..., keypart_n=const 
ORDER BY ... FOR UPDATE
to wait for a lock unneccesarily if another running transaction uses
SELECT ... FOR UPDATE on the same table.

Fixed by setting EQ_RANGE for all range accesses that represent 
an equality predicate.
 2007-08-15 09:23:44 +02:00
malff/marcsql@weblab.(none)
2989cbe05a Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-cleanup
 2007-08-14 20:31:54 -06:00
malff/marcsql@weblab.(none)
f5dc545cb1 Changed whitespace and indentation only, no logic change. 2007-08-14 20:31:06 -06:00
tsmith@ramayana.hindu.god
fa9bacb25c Updates to allow innodb.test to be run with --embedded-server, 
including a small change to build_table_filename().
 2007-08-14 15:35:19 -06:00
evgen@moonbone.local
1cc8f0e383 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/mnt/gentoo64/work/29948-bug-5.0-opt-mysql
 2007-08-14 18:16:34 +04:00
evgen@moonbone.local
4bc4d834fd Bug#29948: Unchecked NULL pointer caused server crash. 
The cli_read_binary_rows function is used to fetch data from the server
after a prepared statement execution. It accepts a statement handler and gets
the connection handler from it. But when the auto-reconnect option is set
the connection handler is reset to NULL after reconnection because the
prepared statement is lost and the handler became useless. This case
wasn't checked in the cli_read_binary_rows function and caused server crash.

Now the cli_read_binary_rows function checks the connection handler to be
not NULL and returns an error if it is.
 2007-08-14 17:28:51 +04:00
monty@mysql.com/narttu.mysql.fi
f07738caac Move function to be visible in embedded server 2007-08-14 15:36:39 +03:00
monty@narttu.mysql.fi
914620e0c0 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel 
into  mysql.com:/home/my/mysql-5.1
 2007-08-14 15:22:44 +03:00
monty@mysql.com/narttu.mysql.fi
5d1c2dc913 Fixed problem that Start_log_event_v3::created was not set properly 
(This is becasue 'when' is not anymore set in constructor)
 2007-08-14 15:20:05 +03:00
gshchepa/uchum@gleb.loc
9308d43490 Merge gleb.loc:/home/uchum/work/bk/5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-08-14 15:39:57 +05:00
msvensson@pilot.(none)
054ab36fcf Remove unused variable 2007-08-14 11:10:23 +02:00
msvensson@pilot.(none)
c446c0006e Remove unused variables 2007-08-14 11:05:42 +02:00
gshchepa/uchum@gleb.loc
67c586ff5c Merge gleb.loc:/home/uchum/work/bk/5.1 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-08-14 13:45:49 +05:00
gshchepa/uchum@gleb.loc
c40fe57fb5 Merge gleb.loc:/home/uchum/work/bk/5.0 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
 2007-08-14 13:44:15 +05:00
kent@mysql.com/kent-amd64.(none)
7287ecd814 make_win_src_distribution_old.sh: 
Rename: scripts/make_win_src_distribution.sh -> scripts/make_win_src_distribution_old.sh
Makefile.am, make_win_src_distribution_old.sh:
  Rename and put in note not to be used
 2007-08-14 00:03:05 +02:00
istruewing@synthia.local
50e3da81c2 Merge synthia.local:/home/mydev/mysql-5.0-axmrg 
into  synthia.local:/home/mydev/mysql-5.1-axmrg
 2007-08-13 23:49:07 +02:00
istruewing@synthia.local
6d67419fb6 Merge synthia.local:/home/mydev/mysql-5.1-amain 
into  synthia.local:/home/mydev/mysql-5.1-axmrg
 2007-08-13 23:46:25 +02:00
monty@narttu.mysql.fi
9d609a59fd Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1
 2007-08-14 00:22:34 +03:00
istruewing@synthia.local
6c95ced6c1 Merge synthia.local:/home/mydev/mysql-4.1-axmrg 
into  synthia.local:/home/mydev/mysql-5.0-axmrg
 2007-08-13 22:00:30 +02:00
tsmith@ramayana.hindu.god
bde833896a Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-08-13 12:47:12 -06:00
tsmith@ramayana.hindu.god
541203b360 Merge ramayana.hindu.god:/home/tsmith/m/bk/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-08-13 12:46:35 -06:00
tsmith@ramayana.hindu.god
7812c2d38a Merge ramayana.hindu.god:/home/tsmith/m/bk/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2007-08-13 12:46:02 -06:00
istruewing@synthia.local
f0c883f3fb Merge synthia.local:/home/mydev/mysql-5.0-amain 
into  synthia.local:/home/mydev/mysql-5.0-axmrg
 2007-08-13 20:45:36 +02:00
istruewing@synthia.local
45647d3bd9 Merge synthia.local:/home/mydev/mysql-4.1-amain 
into  synthia.local:/home/mydev/mysql-4.1-axmrg
 2007-08-13 19:22:35 +02:00