myisam/rt_index.c:
Auto merged
myisam/rt_index.h:
Auto merged
myisam/rt_mbr.c:
Auto merged
myisam/rt_mbr.h:
Auto merged
myisam/rt_split.c:
Auto merged
myisam/rt_test.c:
Auto merged
sql/spatial.cc:
Auto merged
some changes to make code nicer
include/myisampack.h:
mi_sint1korr and similar things added to do conversion in an
uniform way
myisam/rt_index.c:
'if' simplified
myisam/rt_mbr.c:
some fixes to make code nicer and smaller
myisam/rt_test.c:
some modifications to extend test
mysql-test/r/gis-rtree.result:
result became slightly different because of changes made
innobase/os/os0file.c:
after merge fix
sql/ha_innodb.cc:
after merge fix
sql/sql_select.cc:
after merge fix (The patch for 4.0 didn't make sence in 4.1)
Stop InnoDB crash recovery if an .ibd file for a table exists in a database directory, but we cannot access it.
innobase/fil/fil0fil.c:
Stop InnoDB crash recovery if an .ibd file for a table exists in a database directory, but we cannot access it.
client/mysqltest.c:
Auto merged
include/mysql.h:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
innobase/include/row0mysql.h:
Auto merged
innobase/lock/lock0lock.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/README:
Auto merged
mysql-test/r/select_found.result:
Auto merged
mysql-test/t/select_found.test:
Auto merged
mysys/mf_wcomp.c:
Auto merged
mysys/mf_wfile.c:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_base.cc:
Auto merged
configure.in:
Get changes for netware
include/my_sys.h:
Use local file
innobase/include/os0file.h:
auto merge
innobase/os/os0file.c:
auto merge
sql/mysqld.cc:
auto merge
sql/sql_acl.cc:
indentation change
sql/sql_acl.h:
use local file
sql/sql_class.h:
auto merge
sql/sql_db.cc:
use local file
sql/sql_parse.cc:
use local file
sql/sql_select.cc:
Merge
sql/sql_show.cc:
use local file
libmysqld/Makefile.am:
Removed define that is now defined by configure and my_global.h
mysql-test/r/func_gconcat.result:
Fixed test result after removing end space
sql/share/romanian/errmsg.txt:
Fixed wrong error message
sql/sql_insert.cc:
Removed compiler warning
Fixed serbian error messages
Fix for windows regarding changed variable name
configure.in:
Update version number
Added serbian error messages
libmysqld/libmysqld.def:
Fix changed variable names
mysql-test/t/func_gconcat.test:
remove some \r
sql/share/serbian/errmsg.txt:
Added missing error messages
Inside LOCK TABLES, use either LOCK_S or LOCK_X in locking reads; an improvent over the previous patch
sql/ha_innodb.cc:
Inside LOCK TABLES, use either LOCK_S or LOCK_X in locking reads; an improvent over the previous patch
innobase/include/row0mysql.h:
Inside LOCK TABLES, use either LOCK_S or LOCK_X in locking reads; an improvent over the previous patch
innobase/row/row0mysql.c:
Inside LOCK TABLES, use either LOCK_S or LOCK_X in locking reads; an improvent over the previous patch
will disable warnings, --log-warnings will increment warning level by one, or the
level can be given as an optional argument. Default level is 1.
Changed aborted connection warning to be logged only if the level is > 1.
sql/sql_class.h:
Changed boolean into ulong.
sql/sql_parse.cc:
Changed aborted connection warning to be logged only if the level is > 1.
allow deletion of tablespaces whose names contain "'"
innobase/dict/dict0load.c:
dict_check_tablespaces_or_store_max_id():
Dynamically allocate memory for file name
innobase/fil/fil0fil.c:
Dynamically allocate memory for file names
innobase/os/os0file.c:
os_file_dirname(): allocate slightly less memory
os_file_create_subdirs_if_needed(): compare more efficiently
innobase/row/row0mysql.c:
Allow tablespaces with "'" in their names to be deleted
Display identifiers with ut_print_name() or dict_index_name_print()
no AM_MAINTAINER_MODE macro in configure.in
BitKeeper/deleted/.del-compile-pentium-maintainer~3747d5c8d7ec49df:
Delete: BUILD/compile-pentium-maintainer
result": new Item_param member for use in val_str()
sql/item.cc:
Fix for Bug#3796:
- return str_value_ptr from val_str to prevent modifications of parameter
value.
sql/item.h:
Fix for bug#3796:
- Item::val_str() method semantics documented
- new member of Item_param
tests/client_test.c:
Test case for bug #3796 added. A few compile-time warnings removed.
removed influence of some tests on other tests
mysql-test/r/multi_update.result:
removed influence on other tests
mysql-test/r/subselect.result:
if exists should not be used inside test
mysql-test/t/multi_update.test:
removed influence on other tests
mysql-test/t/subselect.test:
if exists should not be used inside test
mysql-test/t/system_mysql_db_fix.test:
removed influence on other tests
empty recordset where some records should be found)
sql/ha_myisam.cc:
Code simplified with vio_ok()
sql/mysqld.cc:
vio_ok used
sql/slave.cc:
vio_ok used
sql/sql_class.cc:
Here is the place of the error - we should not examine net.vio in
embedded library
sql/sql_class.h:
method added to always return TRUE in embedded library, and to
sheck thd.net.vio otherwise
sql/sql_show.cc:
code simplified with vio_ok()
Build-tools/Do-compile:
Added option --config-extra-env
include/my_global.h:
Cleaned up comment to follow same indentation style as the rest of the code
