Commit graph

32397 commits

Author SHA1 Message Date
unknown
03b14c9eca Add some stuff to source package needed for CMake Windows packaging.
Docs/Makefile.am:
  Include Windows manual in source package (if available), needed for CMake
  packaging.
Makefile.am:
  Include initial Windows database files in source package, needed for
  CMake packaging
2006-03-30 11:02:52 +02:00
unknown
4d30f784a4 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/my/mysql-5.1


storage/csv/ha_tina.cc:
  Auto merged
2006-03-30 06:11:34 +03:00
unknown
55e0e30c49 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  xiphis.org:/home/antony/work2/p1-bug18464


configure.in:
  Auto merged
storage/csv/ha_tina.cc:
  Auto merged
storage/example/Makefile.am:
  Auto merged
2006-03-29 17:31:59 -08:00
unknown
ba35887247 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/my/mysql-5.1


mysql-test/t/disabled.def:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
2006-03-30 01:21:48 +03:00
unknown
fa24633f6b Fix for bug#18598 ndb_partition_list 2006-03-29 23:48:35 +02:00
unknown
e7e029a979 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/my/mysql-5.1
2006-03-30 00:48:35 +03:00
unknown
d163e78160 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/alexi/mysql-5.1-new
2006-03-30 01:48:34 +04:00
unknown
447c22165f Null-merge 2006-03-30 00:57:27 +04:00
unknown
4276985534 Restoring changes erroneously removed by applying
the innodb-5.0-ss368 snapshot.
2006-03-30 00:12:55 +04:00
unknown
a02ff019ae Merge monty@192.168.0.9:/my/mysql-5.1
into  mysql.com:/home/my/mysql-5.1


mysql-test/t/disabled.def:
  Auto merged
2006-03-29 23:01:35 +03:00
unknown
3f925ec300 Safety fix to ensure that long event names always ends with \0
This removes a warning about missing DBUG_ENTER while running tests


mysql-test/t/disabled.def:
  Disable test rpl_ndb_multi_update3 that randomly fails on Intel64
2006-03-29 22:58:34 +03:00
unknown
fd6db50c0b Applied innodb-5.0-ss368 snapshot
Fixed bugs:
  : SHOW INNODB STATUS format error in LATEST FOREIGN KEY ERROR section
    dict_foreign_key_error_report(): Always print a newline after invoking
    dict_print_info_on_foreign_key_in_create_format().
  : Better InnoDB error message if ibdata files omitted from my.cnf.
  : CHECK TABLE on InnoDB causes a short hang during check of adaptive hash.
    CHECK TABLE blocking other queries, by releasing the btr_search_latch
    periodically during the adaptive hash table validation.
  : Valgrind: conditional jump or move depends on uninitialised valuesw.
    buf_block_init(): Reset magic_n, buf_fix_count, and io_fix to avoid testing
    uninitialised variables.
  : InnoDB uses full explicit table locks in stored FUNCTION.
  : When locks exhaust the buffer pool, InnoDB does not roll back the trx.
    Check in pessimistic insert and update if the buffer pool is exhausted by locks.
  : Disk space leaks in updates of InnoDB BLOB rows.
    btr_cur_pessimistic_update(): Invoke rec_get_offset() after rec_set_field_extern_bits().
    btr_store_big_rec_extern_fields(): Note that offsets will no longer be valid
    after calling this function.
  : When InnoDB returns error 'lock table full', MySQL can write to binlog too much.
  : InnoDB memory leak on duplicate key errors if row has many columns.
    row_ins_duplicate_error_in_clust(): Call mem_heap_free(heap) at func_exit if needed.
  : Use consistent read in CREATE ... SELECT .. if innodb_locks_unsafe_for_binlog is used.


innobase/btr/btr0cur.c:
  Applied innodb-5.0-ss368 snapshot
innobase/btr/btr0sea.c:
  Applied innodb-5.0-ss368 snapshot
innobase/buf/buf0buf.c:
  Applied innodb-5.0-ss368 snapshot
innobase/buf/buf0lru.c:
  Applied innodb-5.0-ss368 snapshot
innobase/data/data0type.c:
  Applied innodb-5.0-ss368 snapshot
    dtype_print(): Fix printing of prtype.
innobase/dict/dict0dict.c:
  Applied innodb-5.0-ss368 snapshot
innobase/fil/fil0fil.c:
  Applied innodb-5.0-ss368 snapshot
    fil_extend_space_to_desired_size(): in UNIV_HOTBACKUP builds,
    do not touch srv_data_file_sizes[] or srv_n_data_files.
innobase/ha/ha0ha.c:
  Applied innodb-5.0-ss368 snapshot
innobase/include/btr0cur.h:
  Applied innodb-5.0-ss368 snapshot
innobase/include/buf0lru.h:
  Applied innodb-5.0-ss368 snapshot
innobase/include/ha0ha.h:
  Applied innodb-5.0-ss368 snapshot
innobase/include/page0page.ic:
  Applied innodb-5.0-ss368 snapshot
    Remove UNIV_RELEASE_NOT_YET_STABLE and related checks.
innobase/include/univ.i:
  Applied innodb-5.0-ss368 snapshot
    Remove UNIV_RELEASES_NOT_YET_STABLE and related checks.
innobase/row/row0ins.c:
  Applied innodb-5.0-ss368 snapshot
innobase/row/row0sel.c:
  Applied innodb-5.0-ss368 snapshot
    Remove UNIV_RELEASE_NOT_YET_STABLE and related checks.
    page_rec_is_comp(): Remove the bounds check.
    row_sel_field_store_in_mysql_format(): Turn the assertions
    on mbminlen, mbmaxlen, and templ->type into debug assertions.
innobase/row/row0upd.c:
  Applied innodb-5.0-ss368 snapshot
mysql-test/t/innodb.test:
  Applied innodb-5.0-ss368 snapshot
sql/ha_innodb.cc:
  Applied innodb-5.0-ss368 snapshot
    Fix memory allocation bug (by changing MY_WME to MY_FAE) in get_share.
    Also partially fix coding style of the function.
2006-03-29 23:04:32 +04:00
unknown
9f6cf5b6cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/my/mysql-5.1


mysql-test/r/ndb_condition_pushdown.result:
  Auto merged
mysql-test/t/ndb_condition_pushdown.test:
  Auto merged
sql/ha_heap.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged
storage/csv/ha_tina.cc:
  Auto merged
2006-03-29 17:28:40 +03:00
unknown
8ac1d55286 Remove compiler warnings
Add missing DBUG_RETURN
Fixed stack overflow in NdbBlob (found by ndb_gis.test)
Fixed access to freed memory in ndb_cluster_real_free_share()


mysys/mf_keycache.c:
  Add missing DBUG_RETURN
sql/ha_ndbcluster.cc:
  Move free_root to after share handling, as otherwise we will free things needed by free_table_share()
sql/item_func.cc:
  Add missing DBUG_RETURN
sql/item_strfunc.cc:
  Add missing DBUG_RETURN
sql/sp_head.cc:
  Add missing DBUG_RETURN
sql/sql_base.cc:
  Add missing DBUG_RETURN
storage/csv/ha_tina.cc:
  Add missing DBUG_RETURN
storage/myisam/mi_key.c:
  Add missing DBUG_RETURN
storage/myisam/mi_keycache.c:
  Add missing DBUG_RETURN
storage/ndb/include/kernel/signaldata/ArbitSignalData.hpp:
  Remove compiler warning
storage/ndb/include/kernel/signaldata/DictTabInfo.hpp:
  Remove compiler warning
storage/ndb/include/transporter/TransporterDefinitions.hpp:
  Remove compiler warning
storage/ndb/include/util/SimpleProperties.hpp:
  Remove compiler warning
storage/ndb/include/util/SocketServer.hpp:
  Remove compiler warning
storage/ndb/src/ndbapi/ClusterMgr.hpp:
  Remove compiler warning
storage/ndb/src/ndbapi/NdbBlob.cpp:
  Fix stack overflow
storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
  Remove compiler warning
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Remove compiler warning
2006-03-29 17:04:00 +03:00
unknown
b002c11756 Merged. 2006-03-29 15:45:23 +02:00
unknown
d300487f70 Add substitutions for .ini files. 2006-03-29 15:39:53 +02:00
unknown
a754f1befd Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/cps/mysql/devel/5.1-repair-csv
2006-03-29 15:41:13 +04:00
unknown
41e110f777 fix test in --ps-protocol mode
mysql-test/t/csv.test:
  fix test. In --ps-protocol mode warnings are eaten by the test suite.
  Disable ps-protocol mode for the statements, which throw the warnings
  we look for.
2006-03-29 15:37:42 +04:00
unknown
59eaf292de Fixed compiler and valgrind warnings
Added missing DBUG_xxx_RETURN statements
Fixed some usage of not initialized variables (as found by valgrind)
Ensure that we don't remove locked tables used as name locks from open table cache until unlock_table_names() are called.
This was fixed by having drop_locked_name() returning any table used as a name lock so that we can free it in unlock_table_names()
This will allow Tomas to continue with his work to use namelocks to syncronize things.

Note: valgrind still produces a lot of warnings about using not initialized code and shows memory loss errors when running the ndb tests


BitKeeper/etc/ignore:
  added mysql-test/r/*.log
client/mysqltest.c:
  Change type of variables to get rid of compiler warnings
  More debugging
  Fix memory leak
mysql-test/mysql-test-run.sh:
  Collect warnings about missing DBUG_RETURN statements
mysql-test/r/lock_multi.result:
  Add test of new code
mysql-test/r/ndb_condition_pushdown.result:
  Drop used tables before test
mysql-test/t/lock_multi.test:
  Add test of new code
mysql-test/t/ndb_condition_pushdown.test:
  Drop used tables before test
mysql-test/valgrind.supp:
  Ignore 'safe' warnings from libz (when used with archive)
sql/event.cc:
  More comments
  Simplify code
  Fixed memory leak found by valgrind
sql/ha_archive.cc:
  Remove compiler warnings (Wrong handlerton structure and signed/unsigned comparison)
sql/ha_berkeley.cc:
  Fixed compiler warning
sql/ha_blackhole.cc:
  Fixed compiler warning
sql/ha_federated.cc:
  Fixed compiler warning
sql/ha_heap.cc:
  Fixed compiler warning
sql/ha_myisam.cc:
  Fixed compiler warning
sql/ha_myisammrg.cc:
  Fixed compiler warning
sql/ha_ndbcluster.cc:
  Fixed compiler warnings
sql/ha_partition.cc:
  Fixed compiler warning
  Fixed error noticed by valgrind in ha_partition::rnd_init()
sql/handler.cc:
  Fixed compiler warning
sql/handler.h:
  Fixed compiler warning
sql/item.cc:
  Fixed compiler warning
sql/item_xmlfunc.cc:
  Fixed warning from valgrind when calling memcpy with wrong address
sql/lock.cc:
  More debugging
sql/log.cc:
  Fixed compiler warning
  Indentation fixes
sql/log.h:
  Fixed compiler warning
sql/mysql_priv.h:
  Changed prototype for 'drop_locked_tables'
sql/opt_range.cc:
  Indentation fix
sql/password.c:
  Removed compiler warnings
sql/set_var.cc:
  Fixed compiler warning
sql/slave.cc:
  Fixed compiler warning
sql/sp_head.cc:
  Fixed compiler warning
sql/sql_acl.cc:
  Fixed compiler warning
sql/sql_analyse.cc:
  Added missing DBUG_RETURN statements
sql/sql_base.cc:
  Removed de-reference of not initialized pointer
  More comments
  drop_locked_tables() changed to not delete tables used for name locking
  Fixed compiler warnings
sql/sql_delete.cc:
  Fixed usage of not initialized variable
  (deleted could be referenced in some not common error conditions)
sql/sql_parse.cc:
  Added missing DBUG_VOID_RETURN
  Simplify code
sql/sql_partition.cc:
  Fixed usage of wrong variable (noticed by valgrind)
sql/sql_plugin.cc:
  Removed compiler warning
sql/sql_show.cc:
  Removed compiler warning
sql/sql_table.cc:
  Ensure that we don't remove locked tables used as name locks from open table cache until unlock_table_names() are called.
  This was fixed by having drop_locked_name() returning any table used as a name lock so that we can free it in unlock_table_names()
  This will allow Tomas to continue with his work to use namelocks to syncronize things.
  
  Fixed wrong test of 'table_type' (path_length could otherwise be accessed uninitialized)
  
  Remove compile warnings about not initialized variables.
sql/sql_yacc.yy:
  Ensure that no_write_to_binlog is properly initialized
  (Was accessed uninitialized by partition code)
sql/table.cc:
  Removed valgrind warnings (not fatal)
  Removed compiler warnings
sql/tztime.cc:
  Removed valgrind warning
storage/ndb/include/ndbapi/NdbIndexStat.hpp:
  Removed compiler warning
2006-03-29 14:27:36 +03:00
unknown
af74454572 Added more debugging printouts 2006-03-29 13:13:39 +02:00
unknown
734eda5f25 Manual merge
mysql-test/mysql-test-run.pl:
  Merge
sql/mysqld.cc:
  Merge
2006-03-29 12:09:37 +02:00
unknown
077b4888c3 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/cps/mysql/devel/5.1-repair-csv
2006-03-29 13:46:06 +04:00
unknown
7c1c4c7167 Move "start-from" into section "Control what tests to run" 2006-03-29 09:59:16 +02:00
unknown
29ca093e60 Use default value variable when printing out the default timeouts 2006-03-29 09:39:18 +02:00
unknown
1ae58ddfa4 Remove "restart-cleanup" not needed any more as a snapshot of the db will be restored after a failed test case 2006-03-29 09:30:07 +02:00
unknown
5eef76cfed "ndbcluster_port" => "ndbcluster-port"
"ndbcluster_port_slave" => "ndbcluster-port-slave"
2006-03-29 09:15:29 +02:00
unknown
c603c5acc4 "ndbconnectstring" => "ndb-connectstring" 2006-03-29 09:00:48 +02:00
unknown
9d682d54d9 Add comments for "--big-test" aka "--big" and move it to the section "Control what tests to run" 2006-03-29 08:55:29 +02:00
unknown
34c59c2453 GIS test for NDB is failing sporatically.
mysql-test/t/disabled.def:
  Disabling GIS test
2006-03-28 19:25:26 -08:00
unknown
c2f5dfef93 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/cps/mysql/devel/5.1-repair-csv


storage/csv/ha_tina.cc:
  Auto merged
2006-03-29 06:34:12 +04:00
unknown
2a67aecd1a Post-review fixes for WL#3154 "Enable REPAIR for CSV tables"
mysql-test/r/csv.result:
  update result file
mysql-test/t/csv.test:
  add more tests
storage/csv/ha_tina.cc:
  post-review fixes & cleanup
storage/csv/ha_tina.h:
  post-review fixes
2006-03-29 06:28:57 +04:00
unknown
a78f66971b Two additional disabled tests, trying to clear pushbuild.
mysql-test/t/disabled.def:
  Two more disabled tests
2006-03-28 18:18:27 -08:00
unknown
b924ee8d81 Behavior change to preserve schema unless you specify autogenerated SQL or create values.
client/mysqlslap.c:
  Behavior change
2006-03-28 17:59:11 -08:00
unknown
dac2f8893b Creating bugs, disabling tests. Trying to get the 5.1 tree clean under pushbuild.
mysql-test/t/disabled.def:
  Adding tests
2006-03-28 15:10:06 -08:00
unknown
fded4bdf77 Bug#18464
"Can't make example storage engine available"
Build was attempting a shared-lib build instead of static


configure.in:
  configure example to be linked in
storage/csv/ha_tina.cc:
  don't want plugin symbols in mysqld
storage/example/Makefile.am:
  build as static library
storage/example/ha_example.cc:
  don't want plugin symbols in mysqld
2006-03-28 14:34:28 -08:00
unknown
caeb6e274e Remove unused variable 2006-03-28 19:34:44 +02:00
unknown
bc609ffbd0 Add new paths where to look for mysql_client_test 2006-03-28 19:32:50 +02:00
unknown
d02b57ceb8 Remove duplicate declaration of stress_basdir 2006-03-28 19:30:08 +02:00
unknown
35c5732630 Declare innobase "srv_*" variables as extern "C"
sql/mysqld.cc:
  Declare variables using "extern C" just as they are declared in srv0srv.c and set_var.cc
2006-03-28 19:27:38 +02:00
unknown
a0067d7f61 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  linux.site:/home/reggie/work/mysql-5.1
2006-03-28 11:12:59 -06:00
unknown
253289fe43 some simple CMAKE updates
cmakelists.txt:
  restored the /wd4996 flag for vs8 compiles
  broke lines to be <= 79 chars in length
sql/cmakelists.txt:
  broke lines to make them not more than 79 chars long
storage/csv/cmakelists.txt:
  New BitKeeper file ``storage/csv/cmakelists.txt''
2006-03-28 10:05:25 -06:00
unknown
e4637759ca Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/home/bar/mysql-5.1-new
2006-03-28 20:51:50 +05:00
unknown
4638ea25b7 Fix files not removed from make dist when deleted. 2006-03-28 17:34:35 +02:00
unknown
3a60c1b389 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/home/bar/mysql-5.1-new
2006-03-28 20:09:07 +05:00
unknown
567ded2d9b Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  linux.site:/home/reggie/work/mysql-5.1
2006-03-28 09:09:06 -06:00
unknown
2de71f3fa5 restored handlerton-win.cc that I mistakenly deleted.
sql/handlerton-win.cc:
  Rename: BitKeeper/deleted/.del-handlerton-win.cc~322a7e59507976df -> sql/handlerton-win.cc
2006-03-28 09:05:23 -06:00
unknown
cdd75b46c1 Merge bk-internal:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/mysql/tmpbuild
2006-03-28 16:35:50 +02:00
unknown
8cf93ac629 Merge mysql.com:/usr/home/bar/mysql-5.0
into  mysql.com:/usr/home/bar/mysql-5.1-new


mysql-test/r/cast.result:
  Auto merged
sql/field.cc:
  Auto merged
2006-03-28 18:24:04 +05:00
unknown
17d2b065f4 cast.result:
After merge fix.


mysql-test/r/cast.result:
  After merge fix.
2006-03-28 18:21:19 +05:00
unknown
27000fb555 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/gluh/MySQL/Merge/5.1-new
2006-03-28 17:26:45 +05:00