1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-10 23:02:54 +03:00
Commit Graph

23738 Commits

Author SHA1 Message Date
mkindahl@dl145h.mysql.com
0b6471da9c Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
2008-02-27 11:00:43 +01:00
tsmith@ramayana.hindu.god
56719ad7f4 Bug #34053: normal users can enable innodb_monitor logging
The check_global_access() function was made available to InnoDB, but
was not defined in the embedded server library.  InnoDB, as a plugin,
is not recompiled when the embedded server is built.  This caused a
link failure when compiling applications which use the embedded server.

The fix here is to always define check_global_access() externally; in
the embedded server case, it is defined to just return OK.

Also, don't run the test case for this bug in embedded server.
2008-02-22 16:56:34 -07:00
joerg@trift2.
25ab6afc03 Merge trift2.:/MySQL/M51/mysql-5.1
into  trift2.:/MySQL/M51/push-5.1
2008-02-22 16:14:27 +01:00
iggy@alf.(none)
a54f3995ec Merge bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  alf.(none):/src/mysql-5.1-build_31929
2008-02-21 19:53:37 -05:00
vvaintroub@wva.
940806c2ed Merge vvaintroub@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  wva.:C:/bk/bug31745_2/mysql-5.1-build
2008-02-21 01:53:35 +01:00
aelkin/andrei@mysql1000.(none)
49915eb88a Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
into  mysql1000.(none):/home/andrei/MySQL/FIXES/5.1/bug31316-sss_server_id_clashes
2008-02-20 23:25:01 +02:00
aelkin/andrei@mysql1000.(none)
7e93d94ce5 Bug #31316 Report server id clashes in SHOW SLAVE STATUS
"Server_IO_State" field

Critical error messages from get_master_version_and_clock() were written
only to the slave errorlog while Show slave status did not display any
incident happened.

Although the artifact was reported for a particular --replicate-same-server-id
related issue the fix refines all critical error reporting with 
deploying rli->report().

The test for the bug covers only --replicate-same-server-id error reporting.
2008-02-20 23:18:01 +02:00
mkindahl@dl145h.mysql.com
a71f298f2a Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
2008-02-20 19:27:06 +01:00
sven@riska.(none)
80dc1ee7f4 Removed the unused function int THD::binlog_flush_transaction_cache() 2008-02-20 15:22:14 +01:00
sven@riska.(none)
444da164df WL#4078: Document binary format of binlog entries
Minor update with corrections and notes on the binlog format.
This only affects comments, not code.
2008-02-20 14:52:21 +01:00
tomas@poseidon.ndb.mysql.com
39c20516b7 Upon the sql command flush logs, we need to ensure that all outstanding
ndb data to be logged has made it to the binary log to get a deterministic
behavior on the rotation of the log.
2008-02-20 12:52:04 +01:00
tsmith@ramayana.hindu.god
12d0319565 Merge ramayana.hindu.god:/home/tsmith/m/inno/feb18/51
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51
2008-02-19 15:00:13 -07:00
tomas@poseidon.bredbandsbolaget.se
50d95649f7 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
into  poseidon.bredbandsbolaget.se:/home/tomas/mysql-5.1-new-ndb-merge
2008-02-19 20:56:14 +01:00
tsmith@ramayana.hindu.god
b8b6c7fcf7 Applied InnoDB snapshot innodb-5.1-ss2298
Fixes the following bugs:

- Bug #33349: possible race condition revolving around data dictionary and repartitioning
  Introduce retry/sleep logic as a workaround for a transient bug
  where ::open fails for partitioned tables randomly if we are using
  one file per table.

- Bug #34053: normal users can enable innodb_monitor logging
  In CREATE TABLE and DROP TABLE check whether the table in question is one
  of the magic innodb_monitor tables and whether the user has enough rights
  to mess with it before doing anything else.

- Bug #22868: 'Thread thrashing' with > 50 concurrent conns under an upd-intensive workloadw
- Bug #29560: InnoDB >= 5.0.30 hangs on adaptive hash rw-lock 'waiting for an X-lock'
  This is a combination of changes that forward port the scalability fix applied to 5.0
  through r1001.
  It reverts changes r149 and r122 (these were 5.1 specific changes made in lieu of
  scalability fix of 5.0)
  Then it applies r1001 to 5.0 which is the original scalability fix.
  Finally it applies r2082 which fixes an issue with the original fix.

- Bug #30930: Add auxiliary function to retrieve THD::thread_id
  Add thd_get_thread_id() function.  Also make check_global_access() function
  visible to InnoDB under INNODB_COMPATIBILITY_HOOKS #define.
2008-02-19 09:44:09 -07:00
mkindahl@dl145h.mysql.com
e8e74a734f Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
2008-02-19 14:47:29 +01:00
vvaintroub@wva.
b609c158d8 Post-merge fix 2008-02-19 14:25:26 +01:00
vvaintroub@wva.
efa91b5479 Merge wva.:C:/bk/bug31745_2/my51_31754_2/..\my50-bug31745_2
into  wva.:C:/bk/bug31745_2/my51_31754_2
2008-02-19 14:20:46 +01:00
vvaintroub@wva.
f5932c0d95 Bug#31745 - crash handler does not work on Windows
- Replace per-thread signal()'s with  SetUnhandledExceptionFilter(). 
  The only remaining signal() is for SIGABRT (default abort()
  handler in VS2005 is broken, i.e removes user exception filter)
- remove MessageBox()'es  from error handling code
- Windows port for print_stacktrace() and write_core() 
- Cleanup, removed some unused functions
2008-02-19 12:37:39 +01:00
guilhem@gbichot4.local
045f3c4a5d Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  gbichot4.local:/home/mysql_src/mysql-5.1-build-gca
2008-02-18 23:36:57 +01:00
guilhem@gbichot4.local
9e2b31b026 Fix for server bug experienced in Maria (wrong "Truncated incorrect <var_name>
value" error even though the value was correct): a C function in my_getopt.c
was taking bool* in parameter and was called from C++ sql_plugin.cc,
but on some Mac OS X sizeof(bool) is 1 in C and 4 in C++, giving funny
mismatches. Fixed, all other occurences of bool in C are removed, future
ones are blocked by a "C-bool-catcher" in my_global.h (use my_bool).
2008-02-18 23:29:39 +01:00
mkindahl@dl145h.mysql.com
c5273c1759 Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
2008-02-15 17:49:05 +01:00
mats@kindahl-laptop.dnsalias.net
89e2fe8c05 Bug #34458 Extreneous use of templates in server code
Patch to remove white-space left over after removing anonymous
namespace.
2008-02-15 13:06:28 +01:00
mats@kindahl-laptop.dnsalias.net
25dc9eb10b Bug #34458 Extreneous use of templates in server code
Replacing a template function with a normal static function.
The template parameter, which previously was the class to
find a binlogging function in, is now passed as a pointer to
the actual binlogging function instead.

The patch requires change of indention, but that is submitted
as a separate patch.
2008-02-15 12:56:44 +01:00
aelkin/andrei@mysql1000.dsl.inet.fi
416001d8ed Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
into  mysql1000.dsl.inet.fi:/home/andrei/MySQL/MERGE/5.0-bug33931-assert_write_ignored_ev_when_init_slave_fails
2008-02-14 21:38:30 +02:00
aelkin/andrei@mysql1000.dsl.inet.fi
871eb3e5ad bug#33329 extraneous ROLLBACK in binlog on connection does not use trans tables
changes for an assert and an updated results file.
2008-02-14 16:28:32 +02:00
aelkin/andrei@mysql1000.dsl.inet.fi
f5fe34dcd1 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
into  mysql1000.dsl.inet.fi:/home/andrei/MySQL/MERGE/5.0-bug33931-assert_write_ignored_ev_when_init_slave_fails
2008-02-14 13:55:11 +02:00
mkindahl@dl145h.mysql.com
8906700e13 Fixes to try to handle valgrind warnings identical to those in
BUG#24387, which is closed since long.
2008-02-14 09:53:01 +01:00
joerg@trift2.
51f81b0209 Merge trift2.:/MySQL/M51/clone-5.1
into  trift2.:/MySQL/M51/push-5.1
2008-02-13 13:40:53 +01:00
aelkin/andrei@mysql1000.dsl.inet.fi
22072c5c57 Bug #33931 assertion at write_ignored_events_info_to_relay_log if init_slave_thread() fails
and
bug#33932  assertion at handle_slave_sql if init_slave_thread() fails

the asserts were caused by 
  bug33931: having thd deleted at time of executing err: code plus
            a missed initialization;
  bug33932: initialization of slave_is_running member was missed;

fixed with relocating mi members initialization and removing delete thd
It is safe to do as deletion happens later explicitly in the caller of
init_slave_thread().

Todo: at merging the test is better to be moved into suite/bugs for 5.x (when x>0).
2008-02-13 14:09:41 +02:00
joerg@trift2.
341258dba4 Merge trift2.:/MySQL/M51/mysql-5.1
into  trift2.:/MySQL/M51/push-5.1
2008-02-13 13:05:07 +01:00
tomas@poseidon.bredbandsbolaget.se
cc6c696330 Merge poseidon.bredbandsbolaget.se:/home/tomas/mysql-5.1-rpl-merge
into  poseidon.bredbandsbolaget.se:/home/tomas/mysql-5.1-new-ndb-merge
2008-02-13 08:07:24 +01:00
mkindahl@dl145h.mysql.com
a3fe485dfe Various fixes to fix memory leaks after merging replication
tree with main.
2008-02-12 18:21:17 +01:00
aelkin/andrei@mysql1000.dsl.inet.fi
0eba2cf0bf Merge mysql1000.dsl.inet.fi:/home/andrei/MySQL/FIXES/5.0/bug32790-assert_mdel_norm_tables
into  mysql1000.dsl.inet.fi:/home/andrei/MySQL/MERGE/pushed.mysql-5.0-rpl-bug33329-extra_rollback
2008-02-12 12:38:55 +02:00
tomas@poseidon.ndb.mysql.com
3a142141ec Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-rpl-merge
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2008-02-12 11:21:05 +01:00
mkindahl@dl145h.mysql.com
83dac31180 Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2008-02-11 18:10:56 +01:00
tomas@poseidon.ndb.mysql.com
832b498e72 Merge poseidon.ndb.mysql.com:/home/tomas/cge-5.1
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2008-02-11 17:38:34 +01:00
anozdrin/alik@quad.
524cbe2e4c Disabling declaration of debug variable for non-debug builds.
(originally from Mats)
2008-02-11 14:05:27 +03:00
anozdrin/alik@quad.
a52a30e3e6 Patch to eliminate some valgrind warnings in debug printout code.
(originally from Mats)
2008-02-11 14:04:30 +03:00
aelkin/andrei@mysql1000.dsl.inet.fi
0cd061e98f Merge mysql1000.dsl.inet.fi:/home/andrei/MySQL/FIXES/5.0/bug33329-extra_rollback_when_innodb_in
into  mysql1000.dsl.inet.fi:/home/andrei/MySQL/MERGE/mysql-5.0-rpl-bug33329-extra_rollback
2008-02-11 11:26:02 +02:00
kostja@dipika.(none)
b09af4bef4 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  dipika.(none):/opt/local/work/mysql-5.1-runtime
2008-02-09 14:42:26 +03:00
kostja@dipika.(none)
84713274ba Fix a buffer overflow with strmake(). 2008-02-09 10:31:22 +03:00
malff@lambda.hsd1.co.comcast.net.
20e33c30a0 Fixed buffer overflow 2008-02-08 19:37:57 -07:00
kostja@dipika.(none)
add76ef5d5 Fix -ansi -pedantic compilation error 2008-02-08 19:33:24 +03:00
kostja@dipika.(none)
e9c887cc3d Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  dipika.(none):/opt/local/work/mysql-5.1-runtime
2008-02-08 18:55:07 +03:00
kostja@dipika.(none)
d956281e1e Don't complain about a failure to write a log message if we were
simply killed.
2008-02-08 17:25:20 +03:00
kostja@dipika.(none)
209d3d2e18 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  dipika.(none):/opt/local/work/mysql-5.1-runtime
2008-02-08 15:54:21 +03:00
kostja@dipika.(none)
015cdcad4b Silence the slow log errors (they won't make it to the client anyway). 2008-02-08 15:53:57 +03:00
davi@endora.local
9a5e3e103c Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  mysql.com:/Users/davi/mysql/mysql-5.1-runtime
2008-02-08 10:48:16 -02:00
davi@mysql.com/endora.local
15409e87d2 Manual merge of Bug 33798 2008-02-08 10:47:25 -02:00
davi@endora.local
31b22496f4 Merge mysql.com:/Users/davi/mysql/mysql-5.0-runtime
into  mysql.com:/Users/davi/mysql/mysql-5.1-runtime
2008-02-08 10:21:58 -02:00