database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-19 19:03:26 +03:00
Code Activity
45,731 Commits 3,280 Branches 1,098 Tags
7c68e6893c9b22c93a79a9ed26023f8245e37543
Commit Graph

2174 Commits

Author SHA1 Message Date
iggy@recycle.(none)
0b88f8c74c Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint 
into  recycle.(none):/src/bug25621/my51-bug25621
 2007-04-23 14:37:32 -04:00
iggy@recycle.(none)
b8ac729f9d Merge recycle.(none):/src/bug25621/my50-bug25621 
into  recycle.(none):/src/bug25621/my51-bug25621
 2007-04-23 14:34:10 -04:00
iggy@recycle.(none)
30d6cf311a Bug#25621 Error in my_thread_global_end(): 1 threads didn't exit 
- On Windows, connection handlers while exiting properly did not 
decrement the server's thread count.
 2007-04-23 14:28:33 -04:00
msvensson@pilot.blaudden
2ac94c30f4 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-23 17:01:02 +02:00
mats@romeo.(none)
875de0e571 Merge romeo.(none):/home/bkroot/mysql-5.1-rpl 
into  romeo.(none):/home/bk/merge-mysql-5.1
 2007-04-20 10:46:58 +02:00
tsmith@siva.hindu.god
9232def96b Merge siva.hindu.god:/home/tsmith/m/bk/51 
into  siva.hindu.god:/home/tsmith/m/bk/maint/51
 2007-04-18 14:55:42 -06:00
mats@romeo.(none)
93860556e6 Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl 
into  romeo.(none):/home/bk/b25688-mysql-5.1-rpl
 2007-04-12 09:10:45 +02:00
mats@romeo.(none)
11fc24ef24 BUG#25688 (RBR: circular replication may cause STMT_END_F flags to be 
skipped):

By moving statement end actions from Rows_log_event::do_apply_event() to
Rows_log_event::do_update_pos() they will always be executed, even if
Rows_log_event::do_apply_event() is skipped because the event originated
at the same server. This because Rows_log_event::do_update_pos() is always
executed (unless Rows_log_event::do_apply_event() failed with an error,
in which case the slave stops with an error anyway). 

Adding test case.

Fixing logic to detect if inside a group. If a rotate event occured
when an initial prefix of events for a statement, but for which the
table did contain a key, last_event_start_time is set to zero, causing
rotate to end the group but without unlocking any tables. This left a
lock hanging around, which subsequently triggered an assertion when a
second attempt was made to lock the same sequence of tables.

In order to solve the above problem, a new flag was added to the relay
log info structure that is used to indicate that the replication thread
is currently executing a statement. Using this flag, the replication
thread is in a group if it is either in a statement or inside a trans-
action.

The patch also eliminates some gratuitous header file inclusions that
were not needed (and caused compile errors) and replaced them with
forward definitions.
 2007-04-12 08:58:04 +02:00
bar@bar.myoffice.izhnet.ru
b4284d0ef5 Merge mysql.com:/home/bar/mysql-5.0-rpl 
into  mysql.com:/home/bar/mysql-5.1-new-rpl
 2007-04-12 11:31:59 +05:00
bar@mysql.com
e0cc5fd02c mysqld.cc: 
Removing wrong MYF(0) argument.
 2007-04-12 11:29:43 +05:00
msvensson@pilot.blaudden
4774c40089 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-11 22:08:00 +02:00
msvensson@pilot.blaudden
d631f11972 Print warning to log when SSL setup fails 2007-04-11 21:38:43 +02:00
lars/lthalmann@dl145h.mysql.com
1e5d279451 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-04-10 18:26:14 +02:00
jani@ua141d10.elisa.omakaista.fi
b4ba815967 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-marvel
 2007-04-10 16:28:47 +03:00
bar@mysql.com
220c453194 Merge mysql.com:/home/bar/mysql-5.0-rpl 
into  mysql.com:/home/bar/mysql-5.1-new-rpl
 2007-04-09 18:06:27 +05:00
bar@mysql.com
4341df8cf6 Bug#22648 LC_TIME_NAMES: Setting GLOBAL has no effect 
Problem: setting/displaying @@LC_TIME_NAMES didn't distinguish between
GLOBAL and SESSION variable types - always SESSION variable
was set/shonw.
Fix: set either global or session value.
Also, "mysqld --lc-time-names" was added to set "global default" value.
 2007-04-09 17:58:56 +05:00
holyfoot/hf@hfmain.(none)
ce426dd622 Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
 2007-04-07 14:59:53 +05:00
kostja@vajra.(none)
cef9331d7d Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  vajra.(none):/opt/local/work/mysql-5.1-c1
 2007-04-05 20:50:28 +04:00
kostja@vajra.(none)
701ed297d0 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  vajra.(none):/opt/local/work/mysql-5.1-c1
 2007-04-05 15:49:46 +04:00
kostja@vajra.(none)
98db230086 A set of changes aiming to make the Event Scheduler more user-friendly 
when there are no up-to-date system tables to support it:
 - initialize the scheduler before reporting "Ready for connections".
   This ensures that warnings, if any, are printed before "Ready for
   connections", and this message is not mangled.
 - do not abort the scheduler if there are no system tables
 - check the tables once at start up, remember the status and disable
   the scheduler if the tables are not up to date.
   If one attempts to use the scheduler with bad tables,
   issue an error message.
 - clean up the behaviour of the module under LOCK TABLES and pre-locking
   mode
 - make sure implicit commit of Events DDL works as expected.
 - add more tests


Collateral clean ups in the events code.

This patch fixes Bug#23631 Events: SHOW VARIABLES doesn't work 
when mysql.event is damaged
 2007-04-05 15:24:34 +04:00
jani@ua141d10.elisa.omakaista.fi
e40d3631a3 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-marvel
 2007-04-04 21:25:39 +03:00
tsmith@quadxeon.mysql.com
2117193783 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg04/51
 2007-04-04 11:05:22 +02:00
Reggie@vm-xp.
66b0e9ca7a Bug #20376 Doesn't auto-detect data dir 
This changeset fixes the problem where mysql, when run as a service,
can't "detect" it's own data directory.
 2007-04-03 15:05:33 -05:00
jani@ua141d10.elisa.omakaista.fi
e4fde44948 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-marvel
 2007-04-03 14:51:32 +03:00
jamppa@bk-internal.mysql.com
879725900b Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-marvel
 2007-04-03 13:51:31 +02:00
kostja@bodhi.local
93d0316f45 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
 2007-04-03 14:34:37 +04:00
gluh@mysql.com/eagle.(none)
89dec159d1 Bug#27327 information_schema status views, variable_value conversion 
Type of 'Slave_running' status variable is changed to bool
 2007-04-03 14:24:35 +05:00
Kristofer.Pettersson@naruto.
6ca1e16e4e Type cast of constant string (empty) to keep compiler happy. 2007-04-02 14:03:33 +02:00
Kristofer.Pettersson@naruto.
a4b3a9d31d Merge naruto.:C:/cpp/bug26174/my51-bug26174 
into  naruto.:C:/cpp/mysql-5.1-runtime
 2007-04-02 11:09:32 +02:00
Kristofer.Pettersson@naruto.
f85f0950a0 Bug#26174 Server Crash:INSERT ... SELECT ... FROM I_S.GLOBAL_STATUS in Event 
- Some variables in I_S.GLOBAL_STATUS were depending on a network
  connection in order to evaluate. Since no network connection is 
  present during the execution of an event, this caused the server
  to crash.
- The variable function hooks does now verify that the vio-
  object is valid before attempting to use it.
 2007-04-02 09:51:14 +02:00
lars/lthalmann@dl145h.mysql.com
2f0ecd6a14 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-03-31 12:38:20 +02:00
lars/lthalmann@dl145j.mysql.com
f6f848b9e7 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-03-31 00:17:12 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
9c6dc8c853 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
 2007-03-31 00:15:20 +02:00
ibabaev@bk-internal.mysql.com
8c3525ff31 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
 2007-03-30 20:00:12 +02:00
jani@ua141d10.elisa.omakaista.fi
b8d6c2e970 Merged from 5.0 2007-03-29 19:31:42 +03:00
jani@ua141d10.elisa.omakaista.fi
28c122a721 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-marvel
 2007-03-29 17:45:56 +03:00
jamppa@bk-internal.mysql.com
16de7d21cc Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-marvel
 2007-03-29 16:11:29 +02:00
lars/lthalmann@dl145j.mysql.com
771e05d657 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-03-29 13:49:10 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
75668471d1 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
 2007-03-29 12:25:28 +02:00
serg@janus.mylan
fd1d4f864e compiler warnings 2007-03-28 17:12:38 +02:00
serg@janus.mylan
52ca332600 Merge janus.mylan:/usr/home/serg/Abk/mysql-5.0-build 
into  janus.mylan:/usr/home/serg/Abk/mysql-5.1-build
 2007-03-28 15:47:48 +02:00
serg@janus.mylan
e5b660487b restored run-time thread lib detection 2007-03-28 15:33:29 +02:00
jani@ua141d10.elisa.omakaista.fi
9147ad3a8d Small fixes. 2007-03-27 18:48:05 +03:00
gkodinov/kgeorge@magare.gmz
101857299a WL3527: 5.1 
renamed "--old-mode" to "--old" to prevent
 ambiguity.
 "old" now appears in SHOW VARIABLES as a
 read-only option.
 2007-03-26 19:15:30 +03:00
serg@sergbook.mysql.com
1af6b027d6 Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1 
into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0-build
 2007-03-24 14:05:27 +02:00
serg@sergbook.mysql.com
18a01e7261 nptl: typo fixed. sigaddset restored 2007-03-24 14:03:27 +02:00
serg@sergbook.mysql.com
e4164cda68 Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1 
into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0-build
 2007-03-23 20:39:34 +02:00
serg@sergbook.mysql.com
d2d72bfc58 reverted linuxthreads thr_client_alarm fix (not future-proof) 
fixed differently: wake up select_thread with THR_SERVER_ALARM instead
 2007-03-23 20:37:20 +02:00
serg@sergbook.mysql.com
3e9d98b039 Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1 
into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0-build
 2007-03-23 16:37:19 +02:00
serg@sergbook.mysql.com
b37c197512 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
 2007-03-23 14:57:55 +02:00