mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 07:14:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
36056 commits 2776 branches 343 tags 1.6 GiB
Commit graph

36056 commits

This branch
This branch
All branches
Author SHA1 Message Date
mikael/pappa@dator5.(none)
27b06d9dd0 Merge dator5.(none):/home/pappa/clean-mysql-5.1 
into  dator5.(none):/home/pappa/push_tree_w28
 2006-07-15 11:59:39 -04:00
mikael/pappa@dator5.(none)
cc545cc6cf Fixes to make tests work in conjunction with other tests 2006-07-15 07:28:31 -04:00
mikael/pappa@dator5.(none)
30989a77a7 Merge dator5.(none):/home/pappa/clean-mysql-5.1 
into  dator5.(none):/home/pappa/push_tree_w28
 2006-07-15 04:06:31 -04:00
mikael/pappa@dator5.(none)
cacbb674b1 Merge dator5.(none):/home/pappa/clean-mysql-5.1-kt 
into  dator5.(none):/home/pappa/push_tree_w28
 2006-07-15 03:59:53 -04:00
mikael/pappa@dator5.(none)
a6f310d0c2 Merge dator5.(none):/home/pappa/bug20852 
into  dator5.(none):/home/pappa/push_tree_w28
 2006-07-15 03:49:01 -04:00
mikael/pappa@dator5.(none)
425c8883bb Merge dator5.(none):/home/pappa/bug20770 
into  dator5.(none):/home/pappa/push_tree_w28
 2006-07-15 03:46:01 -04:00
mikael/pappa@dator5.(none)
5a2edb5065 Merge dator5.(none):/home/pappa/bug20767 
into  dator5.(none):/home/pappa/push_tree_w28
 2006-07-15 03:41:41 -04:00
mikael/pappa@dator5.(none)
cfc65ef720 BUG#20389: Crash when using index scan in reverse order 2006-07-15 03:38:34 -04:00
kostja@bodhi.local
231565c206 Fix information_schema.result after a manual merge. 2006-07-15 03:08:56 +04:00
kostja@bodhi.local
f536f361d9 Merge bodhi.local:/opt/local/work/tmp_merge 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge-5.0
 2006-07-15 01:04:51 +04:00
sergefp@pylon.mylan
2834bc1eae Merge mysql.com:/home/psergey/tmp_merge-2 
into  mysql.com:/home/psergey/mysql-5.1-merge-2
 2006-07-14 19:10:54 +04:00
kostja@bodhi.local
436e7a2dd9 Post-merge fixes. 2006-07-14 02:07:37 +04:00
kostja@bodhi.local
d7845b74db Merge bodhi.local:/opt/local/work/tmp_merge 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge-5.0
 2006-07-13 22:09:36 +04:00
joerg@trift2.
f6303a8cfb Merge trift2.:/M50/tmp_merge2 
into  trift2.:/M51/merge-5.1
 2006-07-13 19:12:20 +02:00
joerg@trift2.
341f46379c Merge trift2.:/M50/tmp_merge1 
into  trift2.:/M51/merge-5.1
 2006-07-13 19:06:21 +02:00
kostja@bodhi.local
a38b418436 Post-merge fixes. 2006-07-13 17:34:49 +04:00
kostja@bodhi.local
99fefab169 Merge bodhi.local:/opt/local/work/tmp_merge 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge-5.0
 2006-07-13 11:43:52 +04:00
mikael/pappa@dator5.(none)
e9ba287dc7 BUG#20852: Using update with full table scan causes mysqld to enter an eternal loop 2006-07-12 20:38:17 -04:00
kostja@bodhi.local
56353959e7 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
 2006-07-13 00:18:59 +04:00
mkindahl@dl145k.mysql.com
406d50db06 Merge dl145k.mysql.com:/data0/mkindahl/bkroot/mysql-5.1 
into  dl145k.mysql.com:/data0/mkindahl/bk/mysql-5.1-new-rpl
 2006-07-12 10:07:07 +02:00
mkindahl@dl145k.mysql.com
3e81c392fa Merge dl145k.mysql.com:/data0/mkindahl/bk/mysql-5.0-rpl 
into  dl145k.mysql.com:/data0/mkindahl/bk/mysql-5.1-new-rpl
 2006-07-12 09:43:41 +02:00
mkindahl@dl145k.mysql.com
f0537bc503 Post-merge fixes for mysql-5.1-new-rpl 2006-07-12 08:52:47 +02:00
joerg@trift2.
6b1331e44d Merge trift2.:/M50/tmp_merge 
into  trift2.:/M51/merge-5.1
 2006-07-11 19:20:56 +02:00
joerg@trift2.
6dab048f6c Merge trift2.:/M50/tmp_merge 
into  trift2.:/M51/merge-5.1
 2006-07-11 18:59:55 +02:00
mkindahl@dl145k.mysql.com
9415b24139 Merge dl145k.mysql.com:/data0/mkindahl/bkroot/mysql-5.1-new-rpl 
into  dl145k.mysql.com:/data0/mkindahl/bk/MERGE/mysql-5.1-merge
 2006-07-11 12:17:19 +02:00
ingo/mydev@chilla.local
f62b31c60e Merge chilla.local:/home/mydev/mysql-5.1 
into  chilla.local:/home/mydev/mysql-5.1-amerge
 2006-07-11 11:34:38 +02:00
mkindahl@dl145k.mysql.com
34ca2ecd3d Merge dl145k.mysql.com:/data0/mkindahl/bkroot/mysql-5.0-rpl 
into  dl145k.mysql.com:/data0/mkindahl/bk/MERGE/mysql-5.0-merge
 2006-07-11 11:15:22 +02:00
cmiller@zippy.(none)
512d1c7ff3 Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge 
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1
 2006-07-10 17:20:39 -04:00
mikael/pappa@dator5.(none)
65979719c7 BUG#20893: Valgrind error 2006-07-10 17:08:42 -04:00
patg@govinda.patg.net
ddcb190eac Small fix to mysql-5.1-engines, from merge from BUG #19773 2006-07-10 11:57:29 -07:00
aelkin/elkin@andrepl.(none)
0581033b3b Merge andrepl.(none):/home/elkin/MySQL/TEAM/BARE/5.1 
into  andrepl.(none):/home/elkin/MySQL/TEAM/FIXES/5.1/20919_temp_nlog
 2006-07-10 19:56:47 +03:00
guilhem@gbichot3.local
1cc3c80070 fixes after merge. Updates to test's results. 
We now reset the THD members related to auto_increment+binlog in
MYSQL_LOG::write(). This is better than in THD::cleanup_after_query(),
which was not able to distinguish between SELECT myfunc1(),myfunc2()
and INSERT INTO t SELECT myfunc1(),myfunc2() from a binlogging point
of view.
Rows_log_event::exec_event() now calls lex_start() instead of
mysql_init_query() because the latter now does too much (it resets
the binlog format).
 2006-07-10 18:41:03 +02:00
aelkin/elkin@andrepl.(none)
12c6d15820 Merge andrepl.(none):/net/koti/usr_rh9/home/elkin.rh9/MySQL/TEAM/BARE/5.0 
into  andrepl.(none):/home/elkin/MySQL/TEAM/FIXES/5.1/20919_temp_nlog
 2006-07-10 18:12:16 +03:00
guilhem@gbichot3.local
02c17dfb17 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 
into  gbichot3.local:/home/mysql_src/mysql-5.0
 2006-07-10 17:06:19 +02:00
pekka@orca.ndb.mysql.com
4163c91d8e ndb - debug stuff in LQH 2006-07-10 15:43:47 +02:00
pekka@orca.ndb.mysql.com
a3dcbff671 Merge orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50-1.2167.1.2 
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my51-bug18781
 2006-07-10 14:07:40 +02:00
pekka@orca.ndb.mysql.com
9f3b47e53c ndb - bug#18781: close a tiny window (re-commit, try to by-pass merge jam) 2006-07-10 13:59:13 +02:00
pekka@orca.ndb.mysql.com
d525409ba3 Merge orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50-1.2167.1.2 
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my51-bug18781
 2006-07-10 13:54:26 +02:00
pekka@orca.ndb.mysql.com
7c83e6d201 ndb - bug#18781 : 5.0 : add NODE_START_REP from 5.1 (re-commit, try to by-pass merge jam) 2006-07-10 13:44:15 +02:00
guilhem@gbichot3.local
93ce19dfb6 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl 
into  gbichot3.local:/home/mysql_src/mysql-5.1
 2006-07-10 13:26:46 +02:00
mats@romeo.(none)
96fd6751cd Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl 
into  romeo.(none):/home/bk/b20821-mysql-5.1-new-rpl
 2006-07-10 12:54:24 +02:00
ingo/mydev@chilla.local
69bf342a20 Merge chilla.local:/home/mydev/mysql-5.1-amerge 
into  chilla.local:/home/mydev/mysql-5.1-aid
 2006-07-10 12:41:07 +02:00
aelkin/elkin@dsl-hkigw8-feb1fb00-100.dhcp.inet.fi
64d096f988 Merge dsl-hkigw8-feb1fb00-100.dhcp.inet.fi:/usr_rh9/home/elkin.rh9/MySQL/TEAM/BARE/4.1 
into  dsl-hkigw8-feb1fb00-100.dhcp.inet.fi:/usr_rh9/home/elkin.rh9/MySQL/TEAM/FIXES/5.0/20919_temp_nlog
 2006-07-10 13:11:29 +03:00
mats@romeo.(none)
7848edd065 Fixing problem where the command line for MYSQL_DUMP_SLAVE was not 
set properly.
 2006-07-10 12:06:30 +02:00
aelkin/elkin@dsl-hkigw8-feb1fb00-100.dhcp.inet.fi
fadbdf27c3 BUG#20919 temp tables closing fails when binlog is off 
closing temp tables through end_thread
had a flaw in binlog-off branch of close_temporary_tables where
next table to close was reset via table->next
 for (table= thd->temporary_tables; table; table= table->next)
which was wrong since the current table instance got destoyed at
	close_temporary(table, 1);

The fix adapts binlog-on branch method to engage the loop's internal 'next' variable which holds table->next prior table's destoying.
 2006-07-10 00:26:26 +03:00
guilhem@gbichot3.local
bca3fc7800 Merge gbichot3.local:/home/mysql_src/mysql-5.1-interval-move-next-insert-id 
into  gbichot3.local:/home/mysql_src/mysql-5.1
 2006-07-09 22:50:02 +02:00
guilhem@gbichot3.local
17efd43b1a post-merge test/result fixes. 2006-07-09 21:39:21 +02:00
guilhem@gbichot3.local
1bfe0bdf72 Merge gbichot3.local:/home/mysql_src/mysql-5.1-new-19630 
into  gbichot3.local:/home/mysql_src/mysql-5.1
 2006-07-09 21:17:06 +02:00
guilhem@gbichot3.local
b397737989 fixes in test results (using # for positions in SHOW BINLOG EVENTS). 2006-07-09 21:11:52 +02:00
guilhem@gbichot3.local
f6c996f0a2 post-merge fixes 2006-07-09 19:47:54 +02:00