into mysql.com:/opt/local/work/mysql-5.1-merge1
mysql-test/r/ps.result:
Auto merged
mysql-test/t/ps.test:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/sql_select.cc:
Auto merged
VC++Files/client/mysqlslap.vcproj:
Explicit library specification removed from project file
VC++Files/mysql.sln:
Dependency to mysqlclient & mysys is added for mysqlslap in mysql.sln
Remove implicit limit for query word number.
mysql-test/r/fulltext.result:
Reoder results.
storage/myisam/ft_boolean_search.c:
Remove implicit limit for query word number. Instead compute
number of elements and allocate exactly needed memory.
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
qd fix for inconsistency tsman/tup
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
Increase extent pool
storage/ndb/src/kernel/blocks/pgman.cpp:
Increase page entry pool
Run LCP loop wo/ continueb
storage/ndb/src/kernel/blocks/tsman.cpp:
Fix creating of datafiles with more than 1 extent page
- Move init of "reconnect" variable to mysql_init
- Add test case to mysql_client_test.
sql-common/client.c:
Move initialisation of reconnect variable to mysql_init instead of doing it in mysql_real_connect.
tests/mysql_client_test.c:
Add test to check that reconnect is not modified by a call to mysql_real_connect
/var/tmp in my path when testing data diretory. the var directory
exists in a src tree but may not exist in a different testing
build setup.
mysql-test/r/partition_mgm_err.result:
added a row insert just to make sure the data and index files are made
mysql-test/t/partition_mgm_err.test:
removed the /var/tmp path elements since there is not guarantee that
other build setups will include this path
into linux.site:/home/reggie/work/mysql-5.1-bug14354
mysql-test/r/partition_mgm_err.result:
Auto merged
sql/ha_partition.cc:
Auto merged
sql/ha_partition.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_partition.cc:
Auto merged
mysql-test/t/partition_mgm_err.test:
SCCS merged
Add massive printout when failure detected
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Add dumping of replica info
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Add dumping of replica info
WL#1034 (Internal CRON)
mysql-test/r/events.result:
fix results file
mysql-test/t/events.test:
change test for the fix of bug#16404
sql/lex.h:
enabled/disabled were only for events, going back to enable/disable
fix for bug#16404
sql/sql_yacc.yy:
ENABLED -> ENABLE
DISABLED -> DISABLE
fix for bug#16404 (Events: keyword is ENABLED rather than ENABLE)
Try to open an old 5.0 table name
if encoded name doesn't exist.
This makes SELECT working without having
to rename tables with tricky characters
in name into 5.1 format (simpliefies upgrade).
sql/table.cc:
Try to open an old 5.0 table name
if encoded name doesn't exist.
This makes SELECT working without having
to rename tables with tricky characters
in name into 5.1 format (simpliefies upgrade).
into mysql.com:/home/psergey/mysql-5.1-ppruning-r5-push
mysql-test/r/binlog_row_ctype_cp932.result:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.cc:
Auto merged
Updated to remove ndb_dd_disk2memory
ndb_dd_disk2memory.result:
Updated results to match change to show create table for NDB tables. WL 2604
mysql-test/r/ndb_dd_disk2memory.result:
Updated results to match change to show create table for NDB tables. WL 2604
mysql-test/t/disabled.def:
Updated to remove ndb_dd_disk2memory
fix typo + add error code to printable list
storage/ndb/include/kernel/signaldata/Extent.hpp:
Set correct error code
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
err is already negative
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
Set correct error code
storage/ndb/src/ndbapi/ndberror.c:
Add error code to printable list
mysql-test/r/partition_mgm_err.result:
only the single drop table since we have disabled query logging for the create table
mysql-test/t/partition_mgm_err.test:
test for bug #14354
first make sure /tmp/bug14354 is not there, then make the dir
create a partitioned table with the partition using
/tmp/bug14354 as it's data dir
we are disabling query logging since we are using $MYSQL_TEST_DIR
and we are not certain where the tmp files will be created.
sql/ha_partition.cc:
pass partition filename with pathname into
set_up_table_before_create.
remove the path from the passed in value and then append the filename
to the data_file_name or index_file_name if those values were
specified.
sql/ha_partition.h:
added partition_name_with_path to set_up_table_before_create
sql/mysql_priv.h:
move append_file_to_dir to mysql_priv.h
sql/sql_parse.cc:
moving append_file_to_dir to mysql_priv.h
sql/sql_partition.cc:
add_keyword_string was not writing keyword value with quotes
