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

52122 commits

This branch
This branch
All branches
Author SHA1 Message Date
tomas@whalegate.ndb.mysql.com
3a89198273 Bug #33168 Incorrectly handled parameters can make the TC crash during node failure 
- during commit deadlock timeout needs to be at least 5 times db hearbeat
 2007-12-13 21:31:38 +01:00
gluh@eagle.(none)
27dcbc2577 Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-12-13 23:48:13 +04:00
gluh@mysql.com/eagle.(none)
8be07b88df additional fix 2007-12-13 23:46:29 +04:00
dkatz@damien-katzs-computer.local
af6db482d5 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  damien-katzs-computer.local:/Users/dkatz/51runtime
 2007-12-13 14:31:20 -05:00
davi@endora.local
d099e6a257 Merge mysql.com:/Users/davi/mysql/bugs/32395-5.1 
into  mysql.com:/Users/davi/mysql/mysql-5.1-runtime
 2007-12-13 16:33:04 -02:00
gluh@eagle.(none)
b98f95274c Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-12-13 21:34:50 +04:00
gluh@mysql.com/eagle.(none)
b371f6385d additional after merge fix 2007-12-13 21:34:05 +04:00
gluh@mysql.com/eagle.(none)
2627f775be valgrind error fix 2007-12-13 21:13:08 +04:00
gluh@mysql.com/eagle.(none)
5244d7dcf6 after merge fix 2007-12-13 18:26:27 +04:00
tomas@whalegate.ndb.mysql.com
6821f36837 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
 2007-12-13 15:02:10 +01:00
tomas@whalegate.ndb.mysql.com
4b5e9edd69 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
 2007-12-13 14:26:57 +01:00
tomas@whalegate.ndb.mysql.com
f84b45244d Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
 2007-12-13 14:25:16 +01:00
gluh@mysql.com/eagle.(none)
3b227392c9 after merge fix 2007-12-13 16:43:38 +04:00
gluh@eagle.(none)
d504588e79 Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-12-13 16:10:57 +04:00
gluh@eagle.(none)
4f5868114a Merge mysql.com:/home/gluh/MySQL/Merge/5.1 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-12-13 15:56:04 +04:00
gluh@mysql.com/eagle.(none)
9df070ed7c after merge fix 2007-12-13 15:47:23 +04:00
tomas@whalegate.ndb.mysql.com
6bc455e353 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/cge-5.1
 2007-12-13 12:04:00 +01:00
tomas@whalegate.ndb.mysql.com
b009d97f84 Bug #33206 signal not reset properly in ndb 2007-12-13 12:03:11 +01:00
gluh@eagle.(none)
ffeb563d60 Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
 2007-12-13 14:53:24 +04:00
gluh@eagle.(none)
e039595029 Merge mysql.com:/home/gluh/MySQL/Merge/5.0 
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
 2007-12-13 14:52:49 +04:00
sergefp@foxhole.(none)
9f4f6acc53 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/home/psergey/mysql-5.0-bug32198
 2007-12-13 13:39:37 +03:00
sergefp@mysql.com
dd0854db54 BUG#32198: Comparison of DATE with DATETIME still not using indexes correctly 
- Make conditions like "date_col $CMP$ 'datetime-const'" range-sargable
 2007-12-13 13:38:22 +03:00
gluh@mysql.com/eagle.(none)
4e50bb0ebe Merge mysql.com:/home/gluh/MySQL/Merge/4.1 
into  mysql.com:/home/gluh/MySQL/Merge/4.1-opt
 2007-12-13 14:38:01 +04:00
anozdrin/alik@station.
93eef1ce40 Merge station.:/mnt/raid/alik/MySQL/devel/5.1 
into  station.:/mnt/raid/alik/MySQL/devel/5.1-rt
 2007-12-13 12:06:37 +03:00
anozdrin/alik@station.
7d9dd21cd9 Merge station.:/mnt/raid/alik/MySQL/devel/5.0 
into  station.:/mnt/raid/alik/MySQL/devel/5.0-rt
 2007-12-13 12:01:04 +03:00
kostja@bodhi.(none)
2789a12b6a Fix a compilation warning and a subtle bug with truncation of the 
last_insert_id introduced by the patch for Bug#12713 (part 1)
 2007-12-13 05:37:38 +03:00
tsmith@ramayana.hindu.god
c325d0554c Merge ramayana.hindu.god:/home/tsmith/m/bk/build/mrg12dec/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/build/mrg12dec/51
 2007-12-12 19:29:07 -07:00
tsmith@ramayana.hindu.god
07c962393d Bug #33192: mysql_install_db bad merge, corrupt code == appears to succeed but does nothing 
Repair a bad merge that made mysql_install_db silently fail, doing nothing.
 2007-12-12 19:14:28 -07:00
tsmith@ramayana.hindu.god
aac43a2828 Merge ramayana.hindu.god:/home/tsmith/m/bk/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/build/mrg12dec/51
 2007-12-12 18:44:14 -07:00
tsmith@ramayana.hindu.god
31c1ca4f46 Merge ramayana.hindu.god:/home/tsmith/m/bk/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/build/mrg12dec/50
 2007-12-12 18:42:26 -07:00
kostja@bodhi.(none)
572ab7a6b0 Silence a new warning printed by rpl_row_tabledefs_3innodb test execution. 2007-12-13 04:33:54 +03:00
kostja@bodhi.(none)
098832c5ca Fix a compilation error. 2007-12-13 04:19:23 +03:00
davi@mysql.com/endora.local
137e90ed55 Bug#32395 Alter table under a impending global read lock causes a server crash 
The problem is that some DDL statements (ALTER TABLE, CREATE
TRIGGER, FLUSH TABLES, ...) when under LOCK TABLES need to
momentarily drop the lock, reopen the table and grab the write
lock again (using reopen_tables). When grabbing the lock again,
reopen_tables doesn't pass a flag to mysql_lock_tables in
order to ignore the impending global read lock, which causes a
assertion because LOCK_open is being hold. Also dropping the
lock must not signal to any threads that the table has been
relinquished (related to the locking/flushing protocol).

The solution is to correct the way the table is reopenned
and the locks grabbed. When reopening the table and under
LOCK TABLES, the table version should be set to 0 so other
threads have to wait for the table. When grabbing the lock,
any other flush should be ignored because it's theoretically
a atomic operation. The chosen solution also fixes a potential
discrepancy between binlog and GRL (global read lock) because
table placeholders were being ignored, now a FLUSH TABLES WITH
READ LOCK will properly for table with open placeholders.

It's also important to mention that this patch doesn't fix
a potential deadlock if one uses two GRLs under LOCK TABLES
concurrently.
 2007-12-12 19:44:14 -02:00
istruewing@stella.local
8506efa91e Merge stella.local:/home2/mydev/mysql-5.0-axmrg 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2007-12-12 19:52:52 +01:00
istruewing@stella.local
9217f01136 Dummy push to help pushbuild running again. 
Fixed case of comment.
 2007-12-12 19:49:08 +01:00
dkatz@damien-katzs-computer.local
ed00d6955a Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  damien-katzs-computer.local:/Users/dkatz/mysql-5.1-runtime
 2007-12-12 13:14:02 -05:00
dkatz@damien-katzs-computer.local
9a2b51d34a Bug #29993 Default value of log_output should be 'FILE', not 'TABLE' 
Ensure default logging is "file" logging, for additional ways the option can be turned on. Verified on OS X, but not tested automatically.
 2007-12-12 13:05:32 -05:00
kostja@bodhi.(none)
657ce57e4e Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  bodhi.(none):/opt/local/work/mysql-5.1-12713-1
 2007-12-12 18:36:10 +03:00
kostja@bodhi.(none)
ebb9c5d983 Bug#12713 "Error in a stored function called from a SELECT doesn't 
cause ROLLBACK of statement", part 1. Review fixes.

Do not send OK/EOF packets to the client until we reached the end of 
the current statement.
This is a consolidation, to keep the functionality that is shared by all 
SQL statements in one place in the server.
Currently this functionality includes:
- close_thread_tables()
- log_slow_statement().

After this patch and the subsequent patch for Bug#12713, it shall also include:
- ha_autocommit_or_rollback()
- net_end_statement()
- query_cache_end_of_result().

In future it may also include:
- mysql_reset_thd_for_next_command().
 2007-12-12 18:21:01 +03:00
kostja@bodhi.(none)
685f114368 Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
 2007-12-12 06:05:14 +03:00
kostja@bodhi.(none)
90ce3a011e Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
 2007-12-12 06:04:21 +03:00
kostja@bodhi.(none)
4c83efbb95 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.(none):/opt/local/work/mysql-5.0-runtime
 2007-12-12 06:00:10 +03:00
istruewing@stella.local
94c74110d9 Merge stella.local:/home2/mydev/mysql-5.0-axmrg 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2007-12-11 23:59:16 +01:00
istruewing@stella.local
a7c4af78dc Merge stella.local:/home2/mydev/mysql-5.1-amain 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2007-12-11 23:58:38 +01:00
istruewing@stella.local
9b0ab3fc0f Merge stella.local:/home2/mydev/mysql-5.1-ateam 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2007-12-11 23:57:57 +01:00
dkatz@damien-katzs-computer.local
4abafe2617 Bug #30651 Problems with thread_handling system variable 
Changed thread_handling variable to a global only, read only variable, as it is currently used.
 2007-12-11 17:30:42 -05:00
istruewing@stella.local
fb93ba7a08 Merge stella.local:/home2/mydev/mysql-5.0-amain 
into  stella.local:/home2/mydev/mysql-5.0-axmrg
 2007-12-11 23:18:14 +01:00
tomas@whalegate.ndb.mysql.com
0a76bfab51 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/cge-5.1
 2007-12-11 22:22:05 +01:00
istruewing@stella.local
34b317c883 Merge stella.local:/home2/mydev/mysql-5.0-axmrg 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2007-12-11 21:38:50 +01:00
istruewing@stella.local
65fda831ce Merge stella.local:/home2/mydev/mysql-5.1-bug30273 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2007-12-11 21:38:08 +01:00