Commits · f7986a63070b456338c3ee38f639eec7421cf08e · nexedi / MariaDB

03 Aug, 2007 14 commits
- Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint · f7986a63
  msvensson@pilot.(none) authored Aug 03, 2007
```
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
```
  f7986a63
- Add extra newline between diff and error message · fecdca67
  msvensson@pilot.(none) authored Aug 03, 2007
  
  fecdca67
- Update after merge, change "byte" and "gptr" into "uchar" and "uchar*" · e4817a38
  msvensson@pilot.(none) authored Aug 03, 2007
  
  e4817a38
- Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint · 7afa0163
  msvensson@pilot.(none) authored Aug 03, 2007
```
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
```
  7afa0163
- Merge 192.168.0.7:mysql/mysql-5.0-maint · 51abee54
  msvensson@pilot.(none) authored Aug 03, 2007
```
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
```
  51abee54
- WL#3935 Improve mysqltest report and exitcode for diff · cc00660f
  msvensson@shellback.(none) authored Aug 03, 2007
```
 - Move the code to generate test report to the test tool(in this
   case mysqltest) where the best control of what failed is
- Simplify the code in mysql-test-run.pl
- mysqltest will now find what diff to use in a best effort attempt
  using "diff -u", "diff -c" and finally dumping the two files verbatim
  in the report.
```
  cc00660f
- Merge 192.168.0.7:mysql/mysql-5.0-maint · 2258a423
  msvensson@pilot.(none) authored Aug 03, 2007
```
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
```
  2258a423
- Cleanup created procedures in sp.test · d6f02500
  msvensson@shellback.(none) authored Aug 03, 2007
  
  d6f02500
- Remove the temporary file created by mysql_upgrade · 7e86c597
  msvensson@shellback.(none) authored Aug 03, 2007
  
  7e86c597
- Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint · 9e55a4f3
  msvensson@pilot.(none) authored Aug 03, 2007
```
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
```
  9e55a4f3
- Merge 192.168.0.7:mysql/mtr_log/my50-mtr_log · 820f53e8
  msvensson@pilot.(none) authored Aug 03, 2007
```
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
```
  820f53e8
- Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint · ba3c9064
  msvensson@pilot.(none) authored Aug 03, 2007
```
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
```
  ba3c9064
- Improve report on test execution time · ea692e90
  msvensson@pilot.(none) authored Aug 03, 2007
```
Define tot_real_tim locally in mtr_report.pl
```
  ea692e90
- Send output to var/log/mysql-test-run.log to facilitate easier debugging · b3db4671
  msvensson@shellback.(none) authored Aug 03, 2007
```
of mysql-test-run.pl
```
  b3db4671
02 Aug, 2007 21 commits
- Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 0d930158
  ramil/ram@ramil.myoffice.izhnet.ru authored Aug 02, 2007
```
into  mysql.com:/home/ram/work/b30088/b30088.5.0
```
  0d930158
- After-merge fix: result adjusted. · e8eaca54
  ramil/ram@mysql.com/ramil.myoffice.izhnet.ru authored Aug 02, 2007
  
  e8eaca54
- Merge mysql.com:/home/ram/work/b30088/b30088.5.0 · 7512856c
  ramil/ram@ramil.myoffice.izhnet.ru authored Aug 02, 2007
```
into  mysql.com:/home/ram/work/b30088/b30088.5.1
```
  7512856c
- Merge mysql.com:/home/ram/work/b30200/b30200.5.0 · 54ddf932
  ramil/ram@ramil.myoffice.izhnet.ru authored Aug 02, 2007
```
into  mysql.com:/home/ram/work/b30200/b30200.5.1
```
  54ddf932
- Fix for bug #30200: mysqlbinlog.test: connection_id() not restored under ps-protocol · dc84a5fd
  ramil/ram@mysql.com/ramil.myoffice.izhnet.ru authored Aug 02, 2007
```
Problem: thd->thread_specific_used flag is not set executing a statement
containig connection_id() function using PS protocol, that leads to 
improper binlog event creation.

Fix: set the flag in the Item_func_connection_id::fix_fields().
```
  dc84a5fd
- Post-merge fix. Update some test results, and add an InnoDB-only · 0f6f4442
  tsmith@ramayana.hindu.god authored Aug 02, 2007
```
compatibility hook, thd_mark_transaction_to_rollback().
```
  0f6f4442
- Merge 50 -> 51 (-opt changesets) · b13de934
  tsmith@ramayana.hindu.god authored Aug 01, 2007
  
  b13de934
- Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/41 · d66b4bd4
  tsmith@ramayana.hindu.god authored Aug 01, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
```
  d66b4bd4
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · a52a078f
  tsmith@ramayana.hindu.god authored Aug 01, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
```
  a52a078f
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 534c3f32
  tsmith@ramayana.hindu.god authored Aug 01, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
```
  534c3f32
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1-opt · 9d09389c
  tsmith@ramayana.hindu.god authored Aug 01, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/41
```
  9d09389c
- Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 · 76366d79
  tsmith@ramayana.hindu.god authored Aug 01, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
```
  76366d79
- Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/41 · 181da565
  tsmith@ramayana.hindu.god authored Aug 01, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
```
  181da565
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 7509e1ed
  tsmith@ramayana.hindu.god authored Aug 01, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
```
  7509e1ed
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 33c4cdaa
  tsmith@ramayana.hindu.god authored Aug 01, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
```
  33c4cdaa
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1-build · c2399f04
  tsmith@ramayana.hindu.god authored Aug 01, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/41
```
  c2399f04
- Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 · c215bd28
  tsmith@ramayana.hindu.god authored Aug 01, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
```
  c215bd28
- Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/41 · 4e20ec04
  tsmith@ramayana.hindu.god authored Aug 01, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
```
  4e20ec04
- Merge ramayana.hindu.god:/home/tsmith/m/bk/51 · 9ce717b0
  tsmith@ramayana.hindu.god authored Aug 01, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
```
  9ce717b0
- Merge ramayana.hindu.god:/home/tsmith/m/bk/50 · 85752275
  tsmith@ramayana.hindu.god authored Aug 01, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
```
  85752275
- Merge ramayana.hindu.god:/home/tsmith/m/bk/41 · ffc2f3ab
  tsmith@ramayana.hindu.god authored Aug 01, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/41
```
  ffc2f3ab
01 Aug, 2007 5 commits
- Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/51 · 54254530
  tsmith@ramayana.hindu.god authored Aug 01, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/jul31/51
```
  54254530
- Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 · 81430406
  tsmith@ramayana.hindu.god authored Aug 01, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
```
  81430406
- Remove some redundant or unused code from InnoDB (feedback from · ed880ad2
  tsmith@ramayana.hindu.god authored Aug 01, 2007
```
Marko after applying latest snapshot).
```
  ed880ad2
- Fix a valgrind warning. For some reason it never popped up before. · 24595580
  kostja@bodhi.(none) authored Aug 01, 2007
  
  24595580
- Merge trift2.:/MySQL/M51/funcs2-5.1 · e885a589
  joerg@trift2. authored Aug 01, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  e885a589