Commits · 15783e44d0569992751486d59144f1a3951a3c91 · Kirill Smelkov / mariadb

19 Jul, 2006 1 commit
- ndb - bug#14935 fix · 15783e44
  pekka@orca.ndb.mysql.com authored Jul 19, 2006
  
  15783e44
15 Jul, 2006 13 commits
- Minor fix · 3d442310
  mikael/pappa@dator5.(none) authored Jul 15, 2006
  
  3d442310
- Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1 · 1df07ba2
  mikael/pappa@dator5.(none) authored Jul 15, 2006
```
into  dator5.(none):/home/pappa/push_tree_w28
```
  1df07ba2
- Merge orca.ndb.mysql.com:/space_old/pekka/ndb/version/my41-1.2461 · 6da1b59c
  pekka@orca.ndb.mysql.com authored Jul 15, 2006
```
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my51
```
  6da1b59c
- Remove files that tests leave behind · 1c1a1316
  mikael/pappa@dator5.(none) authored Jul 15, 2006
  
  1c1a1316
- Merge dator5.(none):/home/pappa/clean-mysql-5.1 · 27b06d9d
  mikael/pappa@dator5.(none) authored Jul 15, 2006
```
into  dator5.(none):/home/pappa/push_tree_w28
```
  27b06d9d
- ndb - ndb_restore: print some dd errors at right verbosity · 54571ec6
  pekka@orca.ndb.mysql.com authored Jul 15, 2006
  
  54571ec6
- Fixes to make tests work in conjunction with other tests · cc545cc6
  mikael/pappa@dator5.(none) authored Jul 15, 2006
  
  cc545cc6
- Merge dator5.(none):/home/pappa/clean-mysql-5.1 · 30989a77
  mikael/pappa@dator5.(none) authored Jul 15, 2006
```
into  dator5.(none):/home/pappa/push_tree_w28
```
  30989a77
- Merge dator5.(none):/home/pappa/clean-mysql-5.1-kt · cacbb674
  mikael/pappa@dator5.(none) authored Jul 15, 2006
```
into  dator5.(none):/home/pappa/push_tree_w28
```
  cacbb674
- Merge dator5.(none):/home/pappa/bug20852 · a6f310d0
  mikael/pappa@dator5.(none) authored Jul 15, 2006
```
into  dator5.(none):/home/pappa/push_tree_w28
```
  a6f310d0
- Merge dator5.(none):/home/pappa/bug20770 · 425c8883
  mikael/pappa@dator5.(none) authored Jul 15, 2006
```
into  dator5.(none):/home/pappa/push_tree_w28
```
  425c8883
- Merge dator5.(none):/home/pappa/bug20767 · 5a2edb50
  mikael/pappa@dator5.(none) authored Jul 15, 2006
```
into  dator5.(none):/home/pappa/push_tree_w28
```
  5a2edb50
- BUG#20389: Crash when using index scan in reverse order · cfc65ef7
  mikael/pappa@dator5.(none) authored Jul 15, 2006
  
  cfc65ef7
14 Jul, 2006 3 commits
- Fix information_schema.result after a manual merge. · 231565c2
  kostja@bodhi.local authored Jul 15, 2006
  
  231565c2
- Merge bodhi.local:/opt/local/work/tmp_merge · f536f361
  kostja@bodhi.local authored Jul 15, 2006
```
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge-5.0
```
  f536f361
- Merge mysql.com:/home/psergey/tmp_merge-2 · 2834bc1e
  sergefp@pylon.mylan authored Jul 14, 2006
```
into  mysql.com:/home/psergey/mysql-5.1-merge-2
```
  2834bc1e
13 Jul, 2006 7 commits
- Post-merge fixes. · 436e7a2d
  kostja@bodhi.local authored Jul 14, 2006
  
  436e7a2d
- Merge bodhi.local:/opt/local/work/tmp_merge · d7845b74
  kostja@bodhi.local authored Jul 13, 2006
```
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge-5.0
```
  d7845b74
- Merge trift2.:/M50/tmp_merge2 · f6303a8c
  joerg@trift2. authored Jul 13, 2006
```
into  trift2.:/M51/merge-5.1
```
  f6303a8c
- Merge trift2.:/M50/tmp_merge1 · 341f4637
  joerg@trift2. authored Jul 13, 2006
```
into  trift2.:/M51/merge-5.1
```
  341f4637
- Post-merge fixes. · a38b4184
  kostja@bodhi.local authored Jul 13, 2006
  
  a38b4184
- Merge bodhi.local:/opt/local/work/tmp_merge · 99fefab1
  kostja@bodhi.local authored Jul 13, 2006
```
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge-5.0
```
  99fefab1
- BUG#20852: Using update with full table scan causes mysqld to enter an eternal loop · e9ba287d
  mikael/pappa@dator5.(none) authored Jul 12, 2006
  
  e9ba287d
12 Jul, 2006 4 commits
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 56353959
  kostja@bodhi.local authored Jul 13, 2006
```
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
```
  56353959
- Merge dl145k.mysql.com:/data0/mkindahl/bkroot/mysql-5.1 · 406d50db
  mkindahl@dl145k.mysql.com authored Jul 12, 2006
```
into  dl145k.mysql.com:/data0/mkindahl/bk/mysql-5.1-new-rpl
```
  406d50db
- Merge dl145k.mysql.com:/data0/mkindahl/bk/mysql-5.0-rpl · 3e81c392
  mkindahl@dl145k.mysql.com authored Jul 12, 2006
```
into  dl145k.mysql.com:/data0/mkindahl/bk/mysql-5.1-new-rpl
```
  3e81c392
- Post-merge fixes for mysql-5.1-new-rpl · f0537bc5
  mkindahl@dl145k.mysql.com authored Jul 12, 2006
  
  f0537bc5
11 Jul, 2006 6 commits
- Merge trift2.:/M50/tmp_merge · 6b1331e4
  joerg@trift2. authored Jul 11, 2006
```
into  trift2.:/M51/merge-5.1
```
  6b1331e4
- Merge trift2.:/M50/tmp_merge · 6dab048f
  joerg@trift2. authored Jul 11, 2006
```
into  trift2.:/M51/merge-5.1
```
  6dab048f
- ndb - (4.1) trivial fix to error.log (wday=0 was printed as "x") · 6af016ba
  pekka@orca.ndb.mysql.com authored Jul 11, 2006
  
  6af016ba
- Merge dl145k.mysql.com:/data0/mkindahl/bkroot/mysql-5.1-new-rpl · 9415b241
  mkindahl@dl145k.mysql.com authored Jul 11, 2006
```
into  dl145k.mysql.com:/data0/mkindahl/bk/MERGE/mysql-5.1-merge
```
  9415b241
- Merge chilla.local:/home/mydev/mysql-5.1 · f62b31c6
  ingo/mydev@chilla.local authored Jul 11, 2006
```
into  chilla.local:/home/mydev/mysql-5.1-amerge
```
  f62b31c6
- Merge dl145k.mysql.com:/data0/mkindahl/bkroot/mysql-5.0-rpl · 34ca2ecd
  mkindahl@dl145k.mysql.com authored Jul 11, 2006
```
into  dl145k.mysql.com:/data0/mkindahl/bk/MERGE/mysql-5.0-merge
```
  34ca2ecd
10 Jul, 2006 6 commits
- Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge · 512d1c7f
  cmiller@zippy.(none) authored Jul 10, 2006
```
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1
```
  512d1c7f
- BUG#20893: Valgrind error · 65979719
  mikael/pappa@dator5.(none) authored Jul 10, 2006
  
  65979719
- Small fix to mysql-5.1-engines, from merge from BUG #19773 · ddcb190e
  patg@govinda.patg.net authored Jul 10, 2006
  
  ddcb190e
- Merge andrepl.(none):/home/elkin/MySQL/TEAM/BARE/5.1 · 0581033b
  aelkin/elkin@andrepl.(none) authored Jul 10, 2006
```
into  andrepl.(none):/home/elkin/MySQL/TEAM/FIXES/5.1/20919_temp_nlog
```
  0581033b
- fixes after merge. Updates to test's results. · 1cc3c800
  guilhem@gbichot3.local authored Jul 10, 2006
```
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).
```
  1cc3c800
- Merge andrepl.(none):/net/koti/usr_rh9/home/elkin.rh9/MySQL/TEAM/BARE/5.0 · 12c6d158
  aelkin/elkin@andrepl.(none) authored Jul 10, 2006
```
into  andrepl.(none):/home/elkin/MySQL/TEAM/FIXES/5.1/20919_temp_nlog
```
  12c6d158