List:Commits« Previous MessageNext Message »
From:Mattias Jonsson Date:October 6 2008 7:27am
Subject:bzr push into mysql-6.0 branch (mattias.jonsson:2846 to 2847) Bug#38120
View as plain text  
 2847 Mattias Jonsson	2008-10-06 [merge]
      null-merge (bug#38120 was already pushed to 6.0)

 2846 Matthias Leich	2008-10-04 [merge]
      Merge 5.1 -> 6.0 of fixes for Bug#36874,#38427,#37744,#38762
removed:
  mysql-test/suite/funcs_1/r/falcon_storedproc.result
  mysql-test/suite/funcs_1/r/memory_storedproc.result
  mysql-test/suite/funcs_1/r/myisam_storedproc.result
  mysql-test/suite/funcs_1/r/ndb_storedproc.result
  mysql-test/suite/funcs_1/t/falcon_storedproc.test
  mysql-test/suite/funcs_1/t/innodb_storedproc.test
  mysql-test/suite/funcs_1/t/memory_storedproc.test
  mysql-test/suite/funcs_1/t/myisam_storedproc.test
  mysql-test/suite/funcs_1/t/ndb_storedproc.test
added:
  mysql-test/suite/funcs_1/storedproc/param_check.inc
renamed:
  mysql-test/suite/funcs_1/r/innodb_storedproc.result => mysql-test/suite/funcs_1/r/storedproc.result
  mysql-test/suite/funcs_1/storedproc/storedproc_master.inc => mysql-test/suite/funcs_1/t/storedproc.test
modified:
  mysql-test/r/federated_bug_25714.result
  mysql-test/r/slow_launch_time_func.result
  mysql-test/suite/funcs_1/views/func_view.inc
  mysql-test/t/disabled.def
  mysql-test/t/federated_bug_25714.test
  mysql-test/t/slow_launch_time_func.test
  mysql-test/suite/funcs_1/r/storedproc.result
  mysql-test/suite/funcs_1/t/storedproc.test
Thread
• bzr push into mysql-6.0 branch (mattias.jonsson:2846 to 2847) Bug#38120Mattias Jonsson6 Oct