into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged

into  big_geek.:C:/Work/mysql/mysql-5.1-test

libmysqld/cmakelists.txt:
  added generated flag to sql_yacc.cc and sql_yacc.h

into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0

into mysql.com:/home/gluh/MySQL/Merge/5.1-new

into mysql.com:/home/gluh/MySQL/Merge/5.1-new

into  mysql.com:/users/lthalmann/bk/mysql-5.1-new

into mysql.com:/home/hf/work/mysql-5.1.upgrd

into  mysql.com:/home/alexi/bugs/mysql-5.1-temp


mysql-test/r/innodb.result:
  Null-merge
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto-merge

into  mysql.com:/usr/local/mysql/mysql-5.0-tmp

into  mysql.com:/home/alexi/bugs/mysql-5.0-15868-work

into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug15561

Added new test case for bug 17946


mysql-test/r/partition_pruning.result:
  Added new test case for bug 17946
mysql-test/t/partition_pruning.test:
  Added new test case for bug 17946

into  mysql.com:/usr/local/mysql/mysql-5.0-tmp

into  mysql.com:/usr/local/mysql/mysql-5.0-tmp


mysql-test/mysql-test-run.pl:
  Manual merge

into  mysql.com:/home/alexi/bugs/mysql-5.0-15868

client/mysql_upgrade.c:
  code fixed after the discussion

Current auto increment value is placed in partition in which latest
record was saved. So to get auto_increment they have to scan
all partitions and return max value.


mysql-test/r/partition.result:
  Fix for bug#18753 Partitions: auto_increment fails
  test case
mysql-test/t/partition.test:
  Fix for bug#18753 Partitions: auto_increment fails
  test case

into  mysql.com:/home/alexi/bugs/mysql-5.1-15868
 Null-merge


sql/mysqld.cc:
  Null-merge.

 Applied changes due Heikki Tuuri.


sql/mysqld.cc:
  Set innodb_thread_concurrency default value to 8 (Bug#15868).
   Changes due to Heikki Tuuri.

into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug15561

into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug15561

BUG#18423: Added test case for this bug that was already fixed (was issue with hash partitions not showing all rows in BETWEEN range
Added test case for bug 18423


mysql-test/r/partition_hash.result:
  Added test case for bug 18423
mysql-test/t/partition_hash.test:
  Added test case for bug 18423

BUG#18752: Added test case for SHOW CREATE TABLE not showing NULL values properly in bug already fixed
Added new test case for bug 18752 (bug already fixed by previous patch)


mysql-test/r/partition.result:
  Added new test case for bug 18752 (bug already fixed by previous patch)
mysql-test/t/partition.test:
  Added new test case for bug 18752 (bug already fixed by previous patch)

BUG#15561: Possible to strange things with partitions defined although no partition support compiled in
Added an #ifdef to ensure we get syntax error when using partitioned synytax and no partition support is compiled in.


sql/lex.h:
  Added an #ifdef to ensure we get syntax error when using partitioned synytax and no partition support is compiled in.

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0

into  zim.(none):/home/brian/mysql/dep-5.1

mysql-test/t/disabled.def:
  Adding disabled test for bug

into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1


sql/log.cc:
  Auto merged

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new

mysql-test/t/disabled.def:
  Updating for broken tests

into mysql.com:/M51/mysql-5.1