- 04 Oct, 2005 2 commits
- 03 Oct, 2005 9 commits
-
-
unknown authored
into mysql.com:/home/timka/mysql/src/5.0-bug-13410 sql/item.h: Auto merged sql/sql_base.cc: Auto merged sql/table.cc: Auto merged
-
unknown authored
into selena.:H:/MYSQL/src/tmp-mysql-5.0
-
unknown authored
mysql-test/include/check_var_limit.inc: Turn off EOLN_NATIVE flag mysql-test/include/have_big5.inc: Turn off EOLN_NATIVE flag mysql-test/include/have_compress.inc: Turn off EOLN_NATIVE flag mysql-test/include/have_crypt.inc: Turn off EOLN_NATIVE flag mysql-test/include/have_outfile.inc: Turn off EOLN_NATIVE flag mysql-test/include/have_query_cache.inc: Turn off EOLN_NATIVE flag mysql-test/include/have_tis620.inc: Turn off EOLN_NATIVE flag mysql-test/include/have_ucs2.inc: Turn off EOLN_NATIVE flag mysql-test/include/have_ujis.inc: Turn off EOLN_NATIVE flag mysql-test/include/not_embedded.inc: Turn off EOLN_NATIVE flag mysql-test/include/system_db_struct.inc: Turn off EOLN_NATIVE flag mysql-test/include/test_outfile.inc: Turn off EOLN_NATIVE flag mysql-test/r/greedy_optimizer.result: Turn off EOLN_NATIVE flag mysql-test/r/index_merge.result: Turn off EOLN_NATIVE flag mysql-test/r/index_merge_bdb.result: Turn off EOLN_NATIVE flag mysql-test/r/index_merge_innodb.result: Turn off EOLN_NATIVE flag mysql-test/r/index_merge_innodb2.result: Turn off EOLN_NATIVE flag mysql-test/r/index_merge_ror.result: Turn off EOLN_NATIVE flag mysql-test/r/index_merge_ror_cpk.result: Turn off EOLN_NATIVE flag mysql-test/r/join_nested.result: Turn off EOLN_NATIVE flag mysql-test/r/rowid_order_bdb.result: Turn off EOLN_NATIVE flag mysql-test/r/rowid_order_innodb.result: Turn off EOLN_NATIVE flag mysql-test/r/rpl_session_var.result: Turn off EOLN_NATIVE flag mysql-test/r/sp-error.result: Turn off EOLN_NATIVE flag mysql-test/r/sp-security.result: Turn off EOLN_NATIVE flag mysql-test/r/sp.result: Turn off EOLN_NATIVE flag mysql-test/r/sum_distinct.result: Turn off EOLN_NATIVE flag mysql-test/std_data/des_key_file: Turn off EOLN_NATIVE flag mysql-test/std_data/init_file.dat: Turn off EOLN_NATIVE flag mysql-test/std_data/loaddata1.dat: Turn off EOLN_NATIVE flag mysql-test/std_data/loaddata2.dat: Turn off EOLN_NATIVE flag mysql-test/std_data/loaddata3.dat: Turn off EOLN_NATIVE flag mysql-test/std_data/loaddata4.dat: Turn off EOLN_NATIVE flag mysql-test/std_data/rpl_loaddata.dat: Turn off EOLN_NATIVE flag mysql-test/std_data/rpl_loaddata2.dat: Turn off EOLN_NATIVE flag mysql-test/std_data/warnings_loaddata.dat: Turn off EOLN_NATIVE flag mysql-test/t/greedy_optimizer.test: Turn off EOLN_NATIVE flag mysql-test/t/index_merge.test: Turn off EOLN_NATIVE flag mysql-test/t/index_merge_bdb.test: Turn off EOLN_NATIVE flag mysql-test/t/index_merge_innodb.test: Turn off EOLN_NATIVE flag mysql-test/t/index_merge_innodb2.test: Turn off EOLN_NATIVE flag mysql-test/t/index_merge_ror.test: Turn off EOLN_NATIVE flag mysql-test/t/index_merge_ror_cpk.test: Turn off EOLN_NATIVE flag mysql-test/t/join_nested.test: Turn off EOLN_NATIVE flag mysql-test/t/rowid_order_bdb.test: Turn off EOLN_NATIVE flag mysql-test/t/rowid_order_innodb.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_session_var.test: Turn off EOLN_NATIVE flag mysql-test/t/sp-error.test: Turn off EOLN_NATIVE flag mysql-test/t/sp-security.test: Turn off EOLN_NATIVE flag mysql-test/t/sp.test: Turn off EOLN_NATIVE flag mysql-test/t/sum_distinct.test: Turn off EOLN_NATIVE flag
-
unknown authored
-
unknown authored
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/bug13231/my50-bug13231
-
unknown authored
Fix 32/64 bit insecure code ndb/src/mgmsrv/InitConfigFileParser.cpp: Fix 32/64 bit insecure/useless code
-
unknown authored
into mysql.com:/Users/kent/mysql/bk/mysql-5.0 sql/handler.h: Auto merged
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/bug13231/my50-bug13231
-
- 01 Oct, 2005 6 commits
-
-
unknown authored
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
-
unknown authored
Removed "examples/" from path to "ha_archive.cc" VC++Files/sql/mysqld.vcproj: Removed "examples/" from path to "ha_archive.cc"
-
unknown authored
into mysql.com:/Users/kent/mysql/bk/mysql-5.0 mysql-test/mysql-test-run.pl: Auto merged
-
unknown authored
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
-
unknown authored
mysql.user.password doesn't need utf8 mysql-test/lib/init_db.sql: mysql.user.password doesn't need utf8
-
unknown authored
The problem was then when a column reference was resolved to a view column, the new Item created for this column contained the name of the view, and not the view alias. mysql-test/r/view.result: Additional test for BUG#13410. mysql-test/t/view.test: Additional test for BUG#13410. sql/item.cc: Correctly cast 'cur_field' to Item_ident because if the original item is an Item_field, the cur_field is either an Item_field or an Item_ref. Thus we have to cast cur_field to a common super-class of both. sql/item.h: - real_item() may be called before Item_ref::ref is set (i.e. the Item_ref object was resolved). - To avoid a crash and to return some meaningful value in such cases we return 'this'. sql/sql_base.cc: - 'item' may be an Item_ref, so we test for the type of the actual referenced item. - Correctly cast 'cur_field' to Item_ident because if the original item is an Item_field, the cur_field is either an Item_field or an Item_ref. Thus we have to cast cur_field to a common super-class of both. sql/table.cc: - When creating a new Item for a reference to a view column, use the view alias, and not the real view name. - Removed old code
-
- 30 Sep, 2005 23 commits
-
-
unknown authored
into mysql.com:/Users/eric/dev/hton-mysql-5.0
-
unknown authored
BUG#13108 mysql-test/r/federated.result: added test results for federated alter table mysql-test/t/federated.test: added test for federated alter table sql/examples/ha_example.cc: supports table re-creation sql/examples/ha_tina.cc: supports table re-creation sql/ha_blackhole.cc: supports table re-creation sql/ha_federated.cc: added flag for not supporting alter sql/ha_heap.cc: supports table recreation sql/ha_myisam.cc: supports table recreation sql/ha_myisammrg.cc: supports table re-creation sql/handler.cc: implemented flag check function sql/handler.h: added additional handlerton flags created a function to test flags replace ha_supports_generate macro with call to flag check sql/sql_delete.cc: replaced ha_supports_generate with handlerton flag check sql/sql_table.cc: added check for handlerton check for alter support
-
unknown authored
Add Instance Manager tests. mysql-test/include/im_check_os.inc: Currently Instance Manager tests are known to work only on UNIX platform. This header file is included in each IM-test in order to skip the test on Windows. mysql-test/r/im_daemon_life_cycle.result: Results file for Instance Manager daemon test. mysql-test/r/im_life_cycle.result: Results file for Instance Manager life cycle test. mysql-test/r/im_options_set.result: Results file for Instance Manager SET statement test. mysql-test/r/im_options_unset.result: Results file for Instance Manager UNSET statement test. mysql-test/r/im_utils.result: Results file for Instance Manager utils test. mysql-test/t/im_daemon_life_cycle-im.opt: Options file for Instance Manager daemon test. mysql-test/t/im_daemon_life_cycle.imtest: Instance Manager daemon test (mysqltestrun-part). mysql-test/t/im_life_cycle.imtest: Instance Manager life cycle test. mysql-test/t/im_options_set.imtest: Instance Manager SET statement test. mysql-test/t/im_options_unset.imtest: Instance Manager UNSET statement test. mysql-test/t/im_utils.imtest: Instance Manager utils test. mysql-test/t/kill_n_check.sh: The helper script. Its main idea is to kill some process and check that the process will (or will not) be restarted.
-
unknown authored
1) Add support to testing Instance Manager in daemon mode; 2) Don't run Instance Manager tests when running with --ps-protocol option; mysql-test/lib/mtr_cases.pl: WL#2789 "Instance Manager: test using mysql-test-run testing framework" Skip/disable Instance Manager tests in the following cases: - we are testing embedded server; - we are running with --ps-protocol; - Instance Manager executable does not exist; Report about the reason in the standard way. mysql-test/lib/mtr_process.pl: WL#2789 "Instance Manager: test using mysql-test-run testing framework" Make several attempts (i.e. send several signals to process) while trying to kill it. mysql-test/mysql-test-run.pl: WL#2789 "Instance Manager: test using mysql-test-run testing framework" Add support for testing Instance Manager in daemon mode.
-
unknown authored
into mysql.com:/Users/kent/mysql/bk/mysql-5.0 mysql-test/lib/mtr_report.pl: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/t/mysqldump.test: Auto merged sql/ha_innodb.cc: Auto merged sql/sql_base.cc: Auto merged
-
unknown authored
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
-
unknown authored
sql/ha_ndbcluster.cc: SCCS merged sql/handler.h: SCCS merged
-
unknown authored
"SELECT ... FOR UPDATE executed as consistent read inside LOCK TABLES" Do not discard lock_type information as handler::start_stmt() may require knowledge. (fixed by Antony)
-
unknown authored
into mysql.com:/home/dlenev/src/mysql-5.0-merges
-
unknown authored
into mysql.com:/home/dlenev/src/mysql-5.0-bg13629
-
unknown authored
into mysql.com:/home/hartmut/projects/mysql/dev/5.0 ndb/tools/ndb_config.cpp: Auto merged
-
unknown authored
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/bug13231/my50-bug13231 client/mysqltest.c: Auto merged mysql-test/r/mysqltest.result: Auto merged mysql-test/t/query_cache.test: Auto merged sql/mysql_priv.h: Auto merged sql/sql_cache.cc: Auto merged sql/sql_db.cc: Auto merged
-
unknown authored
Revert back 5.0 changes to Visual Studio .Net project files VC++Files/client/mysqlclient.vcproj: Revert back 5.0 changes to Visual Studio .Net project files VC++Files/libmysql/libmysql.vcproj: Revert back 5.0 changes to Visual Studio .Net project files VC++Files/libmysqld/libmysqld.vcproj: Revert back 5.0 changes to Visual Studio .Net project files VC++Files/mysql.sln: Revert back 5.0 changes to Visual Studio .Net project files VC++Files/mysys/mysys.vcproj: Revert back 5.0 changes to Visual Studio .Net project files VC++Files/sql/mysqld.vcproj: Revert back 5.0 changes to Visual Studio .Net project files VC++Files/strings/strings.vcproj: Revert back 5.0 changes to Visual Studio .Net project files
-
unknown authored
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release BUILD/SETUP.sh: Auto merged client/mysql.cc: Auto merged mysql-test/lib/mtr_report.pl: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/t/mysqldump.test: Auto merged scripts/make_win_src_distribution.sh: Auto merged sql/des_key_file.cc: Auto merged
-
unknown authored
back-port to 4.1 and merge forward to 5.x again properly. BitKeeper/deleted/.del-bdb.vcproj~ed8534936e40cefb: Delete: VC++Files/bdb/bdb.vcproj BitKeeper/deleted/.del-mysql.vcproj~f542eaa36b79459d: Delete: VC++Files/client/mysql.vcproj BitKeeper/deleted/.del-mysqladmin.vcproj~4735738126ddd45f: Delete: VC++Files/client/mysqladmin.vcproj BitKeeper/deleted/.del-mysqlclient.vcproj~4e8fd6c239c455e7: Delete: VC++Files/client/mysqlclient.vcproj BitKeeper/deleted/.del-mysqldump.vcproj~72e1d52e8264ee24: Delete: VC++Files/client/mysqldump.vcproj BitKeeper/deleted/.del-mysqlimport.vcproj~f3413e59c84590a6: Delete: VC++Files/client/mysqlimport.vcproj BitKeeper/deleted/.del-mysqlshow.vcproj~89671830c737ad67: Delete: VC++Files/client/mysqlshow.vcproj BitKeeper/deleted/.del-comp_err.vcproj~43c2674631ff6dcd: Delete: VC++Files/comp_err/comp_err.vcproj BitKeeper/deleted/.del-dbug.vcproj~cec9ed672efe1999: Delete: VC++Files/dbug/dbug.vcproj BitKeeper/deleted/.del-heap.vcproj~70c0cc1d680a51c1: Delete: VC++Files/heap/heap.vcproj BitKeeper/deleted/.del-innobase.vcproj~71e1de81f11138bf: Delete: VC++Files/innobase/innobase.vcproj BitKeeper/deleted/.del-mysqltest.vcproj~bba9139c2e68286a: Delete: VC++Files/client/mysqltest.vcproj BitKeeper/deleted/.del-libmysql.vcproj~76b7601f350cd80c: Delete: VC++Files/libmysql/libmysql.vcproj BitKeeper/deleted/.del-libmysqld.vcproj~a1d46f8635014df2: Delete: VC++Files/libmysqld/libmysqld.vcproj BitKeeper/deleted/.del-myTest.vcproj~9dcbfc99784da76d: Delete: VC++Files/libmysqltest/myTest.vcproj BitKeeper/deleted/.del-my_print_defaults.vcproj~805e02c029c13a3d: Delete: VC++Files/my_print_defaults/my_print_defaults.vcproj BitKeeper/deleted/.del-test_libmysqld.vcproj~8ff2f936c65b4814: Delete: VC++Files/libmysqld/examples/test_libmysqld.vcproj BitKeeper/deleted/.del-myisam.vcproj~32bb9e4a163fcb5a: Delete: VC++Files/myisam/myisam.vcproj BitKeeper/deleted/.del-myisam_ftdump.vcproj~cf156af17f00e691: Delete: VC++Files/myisam_ftdump/myisam_ftdump.vcproj BitKeeper/deleted/.del-myisamchk.vcproj~ca51391a749b5066: Delete: VC++Files/myisamchk/myisamchk.vcproj BitKeeper/deleted/.del-myisamlog.vcproj~b642178bf2a443e: Delete: VC++Files/myisamlog/myisamlog.vcproj BitKeeper/deleted/.del-myisammrg.vcproj~6534e59acbfbb63: Delete: VC++Files/myisammrg/myisammrg.vcproj BitKeeper/deleted/.del-myisampack.vcproj~3df8a31f3b603a8: Delete: VC++Files/myisampack/myisampack.vcproj BitKeeper/deleted/.del-mysql.sln~f2120278f8a437be: Delete: VC++Files/mysql.sln BitKeeper/deleted/.del-mysql_test_run_new.vcproj~c953b417c83523a0: Delete: VC++Files/mysql-test/mysql_test_run_new.vcproj BitKeeper/deleted/.del-mysqlbinlog.vcproj~d3fd2c6ed118cd99: Delete: VC++Files/mysqlbinlog/mysqlbinlog.vcproj BitKeeper/deleted/.del-mysqlcheck.vcproj~562fe5a45c9337df: Delete: VC++Files/mysqlcheck/mysqlcheck.vcproj BitKeeper/deleted/.del-mysqldemb.vcproj~a3e9e254c6b572ff: Delete: VC++Files/mysqldemb/mysqldemb.vcproj BitKeeper/deleted/.del-mysqlserver.vcproj~31349c409587c097: Delete: VC++Files/mysqlserver/mysqlserver.vcproj BitKeeper/deleted/.del-mysys.vcproj~6be390f26fc5539a: Delete: VC++Files/mysys/mysys.vcproj BitKeeper/deleted/.del-perror.vcproj~622c06abaff48379: Delete: VC++Files/perror/perror.vcproj BitKeeper/deleted/.del-regex.vcproj~9dfe1e8c7395a8e5: Delete: VC++Files/regex/regex.vcproj BitKeeper/deleted/.del-replace.vcproj~921ddc8d8383ffc6: Delete: VC++Files/replace/replace.vcproj BitKeeper/deleted/.del-mysql_client_test.vcproj~624117036ff1d17c: Delete: VC++Files/tests/mysql_client_test.vcproj BitKeeper/deleted/.del-mysqld.vcproj~703886a28862bb2: Delete: VC++Files/sql/mysqld.vcproj BitKeeper/deleted/.del-strings.vcproj~62578a38fd9e976: Delete: VC++Files/strings/strings.vcproj BitKeeper/deleted/.del-test1.vcproj~f47ec733f5da69d5: Delete: VC++Files/test1/test1.vcproj BitKeeper/deleted/.del-thr_test.vcproj~f5b31bfbc5366334: Delete: VC++Files/thr_test/thr_test.vcproj BitKeeper/deleted/.del-dummy.cpp~d1d2a28e28f91f20: Delete: VC++Files/mysqlserver/dummy.cpp BitKeeper/deleted/.del-vio.vcproj~f575b4666be84569: Delete: VC++Files/vio/vio.vcproj BitKeeper/deleted/.del-zlib.vcproj~997ad815f1f4b73: Delete: VC++Files/zlib/zlib.vcproj
-
unknown authored
into mysql.com:/home/timka/mysql/src/5.0-bug-13597
-
unknown authored
fix for bug #13451 "view test produces warning about unfreed memory"). sql/sql_view.cc: mysql_rename_view(): Intead of doing full-blown opening of view and then doing extensive cleanup of its and main LEXes afterwards, let us just read and parse its .FRM file.
-
unknown authored
into hundin.mysql.fi:/home/marko/mysql-5.0-bk sql/ha_innodb.cc: Ignore 4.1 specific change.
-
unknown authored
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
-
unknown authored
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-icc include/my_sys.h: Auto merged
-
unknown authored
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-icc
-
unknown authored
sql/ha_innodb.cc: Avoid bitwise arithmetics, as it might be difficult to read. The added readability costs one register and two instructions on x86.
-