- 21 Jul, 2005 5 commits
-
-
unknown authored
into c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1 sql/handler.cc: Auto merged sql/lock.cc: Auto merged sql/mysql_priv.h: Auto merged sql/sql_base.cc: Auto merged sql/sql_table.cc: Auto merged storage/myisam/rt_split.c: Auto merged
-
unknown authored
-
unknown authored
into c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0 include/my_sys.h: Auto merged include/thr_lock.h: Auto merged sql/handler.cc: Auto merged sql-common/client.c: Auto merged client/mysqldump.c: Manual merge include/mysql.h: Manual merge libmysql/libmysql.c: Manual merge myisam/rt_split.c: Manual merge mysys/thr_lock.c: Manual merge sql/lock.cc: Manual merge sql/mysql_priv.h: Manual merge sql/sql_base.cc: Manual merge sql/sql_table.cc: Manual merge tests/mysql_client_test.c: Manual merge
-
unknown authored
-
unknown authored
into c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-4.1 include/thr_lock.h: Auto merged mysys/thr_lock.c: Auto merged sql/lock.cc: Auto merged sql/mysql_priv.h: Auto merged sql/sql_base.cc: Auto merged sql/sql_table.cc: Manual merge after 4.0 fix
-
- 20 Jul, 2005 27 commits
-
-
unknown authored
sql/field.cc: Auto merged sql/ha_berkeley.cc: Auto merged sql/ha_federated.cc: Auto merged sql/examples/ha_tina.cc: Auto merged sql/ha_innodb.cc: Auto merged sql/ha_myisam.cc: Auto merged sql/ha_myisammrg.cc: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/handler.h: Auto merged sql/sql_select.cc: Auto merged sql/sql_select.h: Auto merged
-
unknown authored
sql/lock.cc: Used flags immediately in call sql/mysql_priv.h: Added RTFC (short for remove_table_from_cache) for constants and used hex syntax to clarify it is bits in the flags sql/sql_base.cc: Use flags parameter immediately and use flags immediately in call Change to other variant of eternal loop variant sql/sql_table.cc: Use flags immediately in call
-
unknown authored
into mysql.com:/home/jimw/my/mysql-5.0-clean
-
unknown authored
sql/field.cc: Fix type of temporary variables for handling result of number_to_datetime().
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
-
unknown authored
- do not discover temporary files and make them visible
-
unknown authored
This push includes the clone tag. configure.in: Upgraded the version number, as 5.0.10 is cloned off.
-
unknown authored
cursors. This should fix Bug#11813 when InnoDB part is in (tested with a draft patch). The idea of the patch is that if a storage engine supports consistent read views, we open one when open a cursor, set is as the active view when fetch from the cursor, and close together with cursor close. sql/examples/ha_archive.cc: - extend handlerton with cursors methods; fix coding style sql/examples/ha_example.cc: - extend handlerton with cursors methods; fix coding style sql/examples/ha_tina.cc: - extend handlerton with cursors methods; fix coding style sql/ha_berkeley.cc: - extend handlerton with cursors methods sql/ha_blackhole.cc: - extend handlerton with cursors methods; fix coding style sql/ha_federated.cc: - extend handlerton with cursors methods; fix coding style sql/ha_heap.cc: - extend handlerton with cursors methods; fix coding style sql/ha_innodb.cc: - extend handlerton with cursors methods sql/ha_myisam.cc: - extend handlerton with cursors methods; fix coding style sql/ha_myisammrg.cc: - extend handlerton with cursors methods; fix coding style sql/ha_ndbcluster.cc: - extend handlerton with cursors methods sql/handler.h: - extend handlerton with cursors methods sql/sql_select.cc: - create a consistent read view when we open a cursor, set it for a fetch, and free when we closing the cursor. sql/sql_select.h: - add Cursor::ht_info to remember read views used in a cursor. tests/mysql_client_test.c: Disable an assert that will be no longer valid when consistent read views in InnoDB are used.
-
unknown authored
mysql-test/r/partition_list.result: missed in last push
-
unknown authored
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
-
unknown authored
-
unknown authored
into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-4.1 tests/mysql_client_test.c: Auto merged
-
unknown authored
-
unknown authored
client/mysqldump.c: Added casts. include/my_sys.h: Define for alloca() changed for Metrowerks compiler. myisam/rt_split.c: Added cast.
-
unknown authored
sql/field.cc: Fix warnings/compilation failures.
-
unknown authored
into mysql.com:/space/pekka/ndb/version/my50
-
unknown authored
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
-
unknown authored
into mysql.com:/space/pekka/ndb/version/my50-ndb
-
unknown authored
into mysql.com:/usr/home/bar/mysql-4.1.innolike
-
unknown authored
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
-
unknown authored
mysql-test/r/strict.result: Fix results file
-
unknown authored
into mysql.com:/home/jimw/my/mysql-5.0-clean
-
unknown authored
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
-
unknown authored
into mysql.com:/home/jimw/my/mysql-5.0-clean sql/sql_parse.cc: Auto merged
-
unknown authored
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
-
unknown authored
into moonbone.local:/work/mysql-5.0-bug-11760 mysql-test/r/view.result: Auto merged mysql-test/t/view.test: Auto merged
-
unknown authored
by subtime() in view Item_func_add_time::print() were printing arg[0] instead of arg[1] which results in wrongly created view. Functions addtime() and subtime were affected by this bug. sql/item_timefunc.cc: Fix bug #11760 Typo in Item_func_add_time::print() results in wrongly created view mysql-test/t/view.test: Test case for bug #11760 Typo in Item_func_add_time::print() results in wrongly created view mysql-test/r/view.result: Test case for bug #11760 Typo in Item_func_add_time::print() results in wrongly created view mysql-test/r/date_formats.result: Fixed wrong test result. Affected by bug#11760
-
- 19 Jul, 2005 8 commits
-
-
unknown authored
mysql-test/r/ps_1general.result: Update results mysql-test/r/ps_2myisam.result: Update results mysql-test/r/ps_3innodb.result: Update results mysql-test/r/ps_4heap.result: Update results mysql-test/r/ps_5merge.result: Update results mysql-test/r/ps_6bdb.result: Update results mysql-test/r/ps_7ndb.result: Update results mysql-test/r/select.result: Update results mysql-test/t/disabled.def: Disable ndb_condition_pushdown test mysql-test/t/select.test: Fix bad merge sql/field_conv.cc: Update name of warning message sql/mysqld.cc: Set proper thd->killed tests/mysql_client_test.c: Update test cases, change verify_prepared_field() help function so it is passed the filename and line from where it is called and includes that in the error message.
-
unknown authored
-
unknown authored
-
unknown authored
into mysql.com:/space/pekka/ndb/version/my50-ndb
-
unknown authored
into mysql.com:/data0/emurphy/src/mysql-5.0
-
unknown authored
BUG#12040 Fixed compile failure by using %p instead of %x to print a pointer in DBUG_PRINT sql/ha_ndbcluster.cc: BUG#12040 Fixed compile failure by using %p instead of %x to print a pointer in DBUG_PRINT
-
unknown authored
BitKeeper/etc/ignore: added mysql-test/var
-
unknown authored
BUILD/autorun.sh: Auto merged BitKeeper/deleted/.del-var: Delete: mysql-test/var BitKeeper/etc/config: Auto merged configure.in: Auto merged mysql-test/r/information_schema_db.result: Auto merged mysys/Makefile.am: Auto merged mysys/default.c: Auto merged sql/ha_berkeley.cc: Auto merged sql/ha_berkeley.h: Auto merged sql/ha_federated.h: Auto merged sql/ha_innodb.cc: Auto merged sql/ha_innodb.h: Auto merged sql/ha_myisam.cc: Auto merged sql/ha_myisammrg.cc: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/handler.h: Auto merged sql/item.cc: Auto merged sql/lex.h: Auto merged sql/lock.cc: Auto merged sql/log.cc: Auto merged sql/log_event.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/opt_range.cc: Auto merged sql/set_var.cc: Auto merged sql/sp.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_bitmap.h: Auto merged sql/sql_cache.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_lex.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_repl.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_select.h: Auto merged sql/sql_show.cc: Auto merged sql/examples/ha_tina.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/table.h: Auto merged storage/myisam/mi_check.c: Auto merged storage/myisam/mi_create.c: Auto merged storage/myisam/mi_delete.c: Auto merged storage/myisam/mi_extra.c: Auto merged storage/myisam/mi_open.c: Auto merged storage/myisam/mi_preload.c: Auto merged storage/myisam/mi_rsame.c: Auto merged storage/myisam/mi_rsamepos.c: Auto merged storage/myisam/mi_search.c: Auto merged storage/myisam/mi_update.c: Auto merged storage/myisam/mi_write.c: Auto merged storage/myisam/myisamchk.c: Auto merged storage/myisam/myisamdef.h: Auto merged storage/myisam/myisamlog.c: Auto merged storage/myisam/myisampack.c: Auto merged storage/myisam/sort.c: Auto merged storage/ndb/src/common/portlib/NdbMutex.c: Auto merged storage/ndb/src/common/portlib/NdbThread.c: Auto merged support-files/mysql.spec.sh: Auto merged
-