sql/field.cc:
a fix (bug #11546: Bad error message from inserting out of range values, SQL_MODE='tradition').
raise an error in case of strict mode for bit fields.
Fixed bug #11412.
Reversed the patch of cs 1.1934 for the function
create_tmp_table. Modified the function to support
tem_ref objects created for view fields.
item_buff.cc:
Fixed bug #11412.
Modified implementation of new_Cached_item to support
cacheing of view fields.
item.h:
Fixed bug #11412.
Changed implementation of Item_ref::get_tmp_table_field and
added Item_ref::get_tmp_table_item to support Item_ref objects
created for view fields.
view.test, view.result:
Added a test case for bug #11412.
mysql-test/r/view.result:
Added a test case for bug #11412.
mysql-test/t/view.test:
Added a test case for bug #11412.
sql/item.h:
Fixed bug #11412.
Changed implementation of Item_ref::get_tmp_table_field and
added Item_ref::get_tmp_table_item to support Item_ref objects
created for view fields.
sql/item_buff.cc:
Fixed bug #11412.
Modified implementation of new_Cached_item to support
cacheing of view fields.
sql/sql_select.cc:
Fixed bug #11412.
Reversed the patch of cs 1.1934 for the function
create_tmp_table. Modified the function to support
tem_ref objects created for view fields.
was used. (Bug #10724)
mysql-test/r/key_cache.result:
Updated results
mysql-test/r/ps_1general.result:
Updated results
mysql-test/r/user_var.result:
Add new results
mysql-test/r/variables.result:
Update results
mysql-test/t/user_var.test:
Add new regression test
sql/item_func.cc:
Don't set name explicitly in get_system_var(), let it get set by the
select_item: rule in sql_parse.yy or other callers of get_system_var().
sql/sql_parse.cc:
Set the name on the Item returned by get_system_var().
into mysql.com:/home/jonas/src/mysql-4.1-push
ndb/src/mgmapi/mgmapi.cpp:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
ndb/src/mgmsrv/ConfigInfo.hpp:
Auto merged
sql/field.cc:
fix (bug #11964: ALTER TABLE gives wrong error message with sql-mode TRADITIONAL (timestamp)).
set def only if timestamp fields have explicit default value.
into mysql.com:/home/jonas/src/mysql-5.1-push
storage/ndb/include/mgmapi/mgmapi.h:
Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.hpp:
Auto merged
storage/ndb/tools/Makefile.am:
merge
mysql-test/r/ndb_config.result:
New BitKeeper file ``mysql-test/r/ndb_config.result''
mysql-test/t/ndb_config.test:
New BitKeeper file ``mysql-test/t/ndb_config.test''
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug1-5.0
BitKeeper/etc/config:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_cache.cc:
Auto merged
mysql-test/r/query_cache.result:
SCCS merged
mysql-test/t/query_cache.test:
SCCS merged
mysql-test/r/query_cache.result:
query in QC from normal execution and SP
mysql-test/t/query_cache.test:
environment restoring fix
layout fix
query in QC from normal execution and SP
sql/mysql_priv.h:
store SERVER_MORE_RESULTS_EXISTS
sql/sql_cache.cc:
store SERVER_MORE_RESULTS_EXISTS in key of query cache
BitKeeper/etc/config:
switching logging off
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1
BitKeeper/etc/config:
Auto merged
sql/field.cc:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/ha_berkeley.h:
Auto merged
sql/ha_heap.cc:
Auto merged
sql/ha_heap.h:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/ha_myisam.h:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/ha_myisammrg.h:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/handler.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_table.cc:
Auto merged
sql/ha_ndbcluster.cc:
Merge.
sql/field.h:
Auto merged
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
storage/ndb/test/include/UtilTransactions.hpp:
Auto merged
storage/ndb/test/src/HugoOperations.cpp:
Auto merged
storage/ndb/test/src/UtilTransactions.cpp:
Auto merged
mysql-test/r/alter_table.result:
Added some additional tests for new alter table code.
mysql-test/t/alter_table.test:
Added some additional tests for new alter table code.
sql/field.cc:
Functions to check whether new field is equal with old field.
Classes for different types.
sql/field.h:
Functions to check whether new field is equal with old field.
Classes for different types.
sql/ha_berkeley.cc:
check_if_incompatible_data() for BDB.
sql/ha_berkeley.h:
check_if_incompatible_data() for BDB.
sql/ha_heap.cc:
check_if_incompatible_data() for HEAP.
sql/ha_heap.h:
check_if_incompatible_data() for HEAP.
sql/ha_innodb.cc:
check_if_incompatible_data() for InnoDB.
sql/ha_innodb.h:
check_if_incompatible_data() for InnoBD.
sql/ha_myisam.cc:
check_if_incompatible_data() for MyISAM.
sql/ha_myisam.h:
check_if_incompatible_data() for MyISAM.
sql/ha_myisammrg.cc:
check_if_incompatible_data() for Merge tables.
sql/ha_myisammrg.h:
check_if_incompatible_data() for Merge tables.
sql/ha_ndbcluster.cc:
check_if_incompatible_data() for NDB.
sql/ha_ndbcluster.h:
check_if_incompatible_data() for NDB.
sql/handler.h:
Defines for COMPATIBLE_DATA (yes and no) and the default function
for check_if_incompatible_data().
sql/mysql_priv.h:
Defines for IS_EQUAL_*
sql/mysqld.cc:
Added option --old-alter-table to disable new alter table code.
sql/set_var.cc:
Added option --old-alter-table to disable new alter table code.
sql/set_var.h:
Added option --old-alter-table to disable new alter table code.
sql/sql_class.h:
Added option --old-alter-table to disable new alter table code.
sql/sql_lex.h:
Added a flag for forcing recreation of a table
(needed for optimize table mapped to alter table)
sql/sql_table.cc:
Made a function of setting table default charset, used
now in two places.
Added defines for ALTER_TABLE_* possible changes.
Currently just overall data and index.
Added function compare_tables, which checks fields
compatibility in old and new tables.
BitKeeper/etc/config:
Disabled logging
mysql-test/r/ndb_partition_error.result:
New test program
mysql-test/t/ndb_partition_error.test:
New test program
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Fixed error handling after CREATE_FRAGMENTATION_REF
into mysql.com:/home/jimw/my/mysql-5.0-clean
mysql-test/r/create.result:
Auto merged
mysql-test/r/func_str.result:
Auto merged
mysql-test/t/func_str.test:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/sql_table.cc:
Auto merged
mysql-test/t/create.test:
Resolve conflict
sql/mysql_priv.h:
Resolve conflict
sql/table.cc:
Resolve conflict
sql/unireg.cc:
Resolve conflict
mysql-test/r/partition_error.result:
Fixed result files after rearranging code a bit
mysql-test/t/partition_error.test:
Fixed result files after rearranging code a bit
sql/share/errmsg.txt:
Fixed result files after rearranging code a bit
sql/sql_yacc.yy:
Added initialisation
client via mysql_fetch_fields(). (Bug #11311)
mysql-test/r/func_str.result:
Add new results
mysql-test/t/func_str.test:
Add new regression test
sql/item_strfunc.cc:
Fix length reported for LPAD() and RPAD() -- they always truncate to the
length that is given.
Bug #11987
mysql will truncate the text when the text contain GBK char:"0xA3A0" and "0xA1"
Allow to store and retrieve even unassigned GBK codes.
Like we did in Big5 earlier.
have_gbk.inc, have_gbk.require, ctype_gbk.result, ctype_gbk.test:
new file
strings/ctype-gbk.c:
Bug #11987
mysql will truncate the text when the text contain GBK char:"0xA3A0" and "0xA1"
Allow to store and retrieve even unassigned GBK codes.
Like we did in Big5 earlier.
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
sql/slave.cc:
Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
Auto merged
storage/ndb/tools/restore/Restore.cpp:
Auto merged
storage/ndb/tools/restore/consumer_printer.hpp:
Auto merged
storage/ndb/tools/restore/restore_main.cpp:
Auto merged
into mysql.com:/usr/home/bar/mysql-5.0
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
strings/ctype-utf8.c:
Auto merged
mysql-test/r/sp.result:
added expected result for bug #8692
mysql-test/t/sp.test:
added testcase for bug #8692
sql/protocol_cursor.cc:
fixed detecting of null fields: A field contains a null value only
if length is NULL_LENGTH
non-existent database. (Bug #10407)
mysql-test/r/create.result:
Update results
mysql-test/t/create.test:
Update error numbers
sql/mysql_priv.h:
Adjust some other function signature so table and db information
is passed down into create_frm().
sql/sql_table.cc:
Check for database not existing after hitting an error when
copying the .frm file for 'CREATE TABLE ... LIKE ...', and
pass table and db name into rea_create_table().
sql/table.cc:
Generate specific error message when .frm creation fails because
the database does not exist.
sql/unireg.cc:
Pass database and table name down into create_frm().
tree on brian's amd 64 box (which was already approved).
[patg@zim mysql-5.0]$ bk changes
ChangeSet@1.1882, 2005-07-21 18:43:55+05:00, gluh@eagle.intranet.mysql.r18.ru
merge fix
Was the changeset level I applied this patch to.
Master shutdown finished
Slave shutdown finished
All 326 tests were successful.
[patg@zim mysql-5.0]$
client/mysqldump.c:
This is a fresh application of Magnus Svensson's patch for bug 10431
mysql-test/r/mysqldump.result:
Fresh application of Magnus Svensson's patch for bug 10431
mysql-test/t/mysqldump.test:
fresh application of Magnus Svensson's patch for bug 10431
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
sql/field.cc:
Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
Auto merged
storage/ndb/src/kernel/vm/Makefile.am:
Auto merged
strings/ctype-big5.c:
Auto merged
into mysql.com:/usr/home/bar/mysql-5.0
BitKeeper/deleted/.del-ctype-cp932.c:
Auto merged
BitKeeper/deleted/.del-ctype_cp932.result:
Auto merged
BitKeeper/deleted/.del-ctype_cp932.test:
Auto merged
mysql-test/r/ctype_ujis.result:
Auto merged
strings/ctype-big5.c:
Auto merged
strings/ctype-gbk.c:
Auto merged
strings/ctype-simple.c:
Auto merged
strings/ctype-sjis.c:
Auto merged
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
extra/perror.c:
Auto merged
include/my_global.h:
Auto merged
mysql-test/r/ps_6bdb.result:
Auto merged
mysql-test/r/ps_7ndb.result:
Auto merged
BitKeeper/deleted/.del-var~62c955ccf2da1a21:
Auto merged
mysql-test/t/disabled.def:
Auto merged
sql/field.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.hpp:
Auto merged
storage/ndb/src/mgmsrv/main.cpp:
Auto merged
into mysql.com:/home/jimw/my/mysql-5.0-clean
libmysql/libmysql.c:
Auto merged
mysql-test/r/ps_2myisam.result:
Auto merged
mysql-test/r/ps_3innodb.result:
Auto merged
mysql-test/r/ps_4heap.result:
Auto merged
mysql-test/r/ps_5merge.result:
Auto merged
mysql-test/r/ps_6bdb.result:
Auto merged
mysql-test/r/ps_7ndb.result:
Auto merged
sql/field.cc:
Auto merged
mysql-test/r/strict.result:
Resolve conflict
mysql-test/t/strict.test:
Resolve conflict
into mysql.com:/home/jimw/my/mysql-5.0-clean
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
sql/item_timefunc.cc:
Auto merged
