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

36152 commits

This branch
This branch
All branches
Author SHA1 Message Date
msvensson@neptunus.(none)
fe40a8cf9d Merge bk-internal:/home/bk/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-07-19 08:57:52 +02:00
andrey@lmy004.
02e14e6358 Merge lmy004.:/work/mysql-5.1-runtime 
into  lmy004.:/work/mysql-5.1-clean
 2006-07-18 23:22:24 +02:00
andrey@lmy004.
a68400dd98 Fix windows build of libmysqld. Curious why pushbuild did not 
catch that.
Stale CMakeLists.txt
 2006-07-18 23:08:13 +02:00
gluh@mysql.com/vva.(none)
7c0930c4ae after merge fix 2006-07-18 20:13:13 +05:00
gluh@myoffice.izhnet.ru
f76aec6d90 Merge myoffice.izhnet.ru:/usr/home/gluh/MySQL/tmp_merge 
into  myoffice.izhnet.ru:/usr/home/gluh/MySQL/5.1
 2006-07-18 18:43:55 +05:00
msvensson@neptunus.(none)
601d948099 Fix erroneous join function use 2006-07-18 15:15:43 +02:00
msvensson@neptunus.(none)
da214608b4 Add verbose printouts for im_start and im_stop 2006-07-18 14:53:50 +02:00
mikael/pappa@dator5.(none)
bae61f209d Fixed test case 2006-07-17 06:53:46 -04:00
mikael/pappa@dator5.(none)
6019ac9b71 Fixes for strange appearance of db.opt file 2006-07-17 06:41:12 -04:00
mikael/pappa@dator5.(none)
3d44231064 Minor fix 2006-07-15 17:05:47 -04:00
mikael/pappa@dator5.(none)
1df07ba2d8 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  dator5.(none):/home/pappa/push_tree_w28
 2006-07-15 17:04:56 -04:00
pekka@orca.ndb.mysql.com
6da1b59c08 Merge orca.ndb.mysql.com:/space_old/pekka/ndb/version/my41-1.2461 
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my51
 2006-07-15 18:02:47 +02:00
mikael/pappa@dator5.(none)
1c1a131675 Remove files that tests leave behind 2006-07-15 12:01:46 -04:00
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
pekka@orca.ndb.mysql.com
54571ec6ad ndb - ndb_restore: print some dd errors at right verbosity 2006-07-15 17:53:57 +02: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
tsmith/tim@siva.hindu.god
6971ddee1a Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  siva.hindu.god:/usr/home/tim/m/bk/merge-51
(which is mysql-5.1-new-maint team tree)
 2006-07-15 00:33:24 -06: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
pekka@orca.ndb.mysql.com
6af016ba8a ndb - (4.1) trivial fix to error.log (wday=0 was printed as "x") 2006-07-11 17:07:23 +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
cmiller@zippy.(none)
9be1c70404 Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1 
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new-maint
 2006-07-10 13:38:22 -04: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