into c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826
sql/ha_ndbcluster.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
ndb: corrected initialization of records
mysql-test/Makefile.am:
ndb: corrected install dir
sql/ha_ndbcluster.cc:
ndb: corrected initialization of records
into c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18962
mysql-test/r/partition_pruning.result:
Auto merged
sql/partition_info.cc:
Auto merged
Fixed up create_handler_files call
sql/ha_ndbcluster.cc:
Fixed up create_handler_files call
sql/ha_partition.cc:
Fixed up create_handler_files call
sql/handler.h:
Fixed up create_handler_files call
sql/sql_table.cc:
Fixed up create_handler_files call
sql/unireg.cc:
Fixed up create_handler_files call
into c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826
configure.in:
Auto merged
dbug/dbug.c:
Auto merged
include/my_sys.h:
Auto merged
sql/ha_heap.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/partition_info.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_partition.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
BUILD/SETUP.sh:
manual merge
BUILD/compile-pentium-debug-max:
manual merge
sql/ha_ndbcluster.cc:
manual merge
sql/ha_ndbcluster.h:
manual merge
sql/ha_partition.cc:
manual merge
sql/ha_partition.h:
manual merge
sql/handler.h:
manual merge
sql/share/errmsg.txt:
manual merge
sql/sql_table.cc:
manual merge
sql/unireg.cc:
manual merge
Various bug fixes (mostly mixed to and from in replace methods)
sql/sql_partition.cc:
Various bug fixes (mostly mixed to and from in replace methods)
sql/sql_table.cc:
Various bug fixes (mostly mixed to and from in replace methods)
into mysql.com:/opt/local/work/mysql-5.1-merge
mysql-test/r/ps.result:
Auto merged
mysql-test/t/ps.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/set_var.cc:
Manual merge.
sql/set_var.h:
Manual merge.
sql/share/errmsg.txt:
Manual merge.
Moved error inject from being flags to compiler to being part of config.h
Also error inject only defined if debug is also defined
+Small fixes
configure.in:
Moved error inject from being flags to compiler to being part of config.h
Also error inject only defined if debug is also defined
sql/handler.h:
Small fixes
Use \0 to indicate frm-file
Add more comments
Add more #ifdef code missing previously
sql/sql_partition.cc:
Use \0 to indicate frm-file
sql/sql_table.cc:
Use \0 to indicate frm-file
Add more comments
Add more #ifdef code missing previously
into rurik.mysql.com:/home/igor/mysql-5.1
mysql-test/r/innodb.result:
Auto merged
mysql-test/t/innodb.test:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/item_timefunc.h:
Auto merged
sql/sql_insert.cc:
Auto merged
Fix the way that instance manager finds the version number of instances,
so that it works properly when the executable name isn't the same as what
the instance-manager launched, such as when wrapping a libtool-wrapped
executable from the source tree.
This removes the 'Ver ' reported in the version column output by
'SHOW INSTANCE STATUS ...', but the format of this column is not
documented (and is pretty free-form to begin with).
server-tools/instance-manager/instance_options.cc:
Look for 'Ver' to get version from running mysqld --version
server-tools/instance-manager/parse_output.cc:
Make parse_output_and_get_value() look at the whole line to find
the word, instead of just at the beginning of each line.
sql/mysqld.cc:
Note that the instance manager relies on 'Ver' in mysqld --version
mysql-test/r/archive.result:
Adding test case for data directory support in create table.
mysql-test/t/archive.test:
Added test for "data directory" support in archive.
sql/ha_archive.cc:
Updated comments, added printable bits for support of "data directory"
sql/ha_archive.h:
Added real_path to share (will come in handy in later code)
