- 30 Jun, 2006 19 commits
-
-
unknown authored
into mysql.com:/home/my/mysql-5.0 libmysql/libmysql.c: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/t/key.test: Auto merged sql/table.cc: Auto merged mysql-test/r/key.result: Manual merge mysql-test/t/mysqldump.test: Manual merge (Now we have same code as in 4.1 and 5.1) sql/ha_ndbcluster.cc: Manual merge Change %ll -> llstr() tests/mysql_client_test.c: manual merge
-
unknown authored
into mysql.com:/home/my/mysql-4.1
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
-
unknown authored
mysql-test/r/key.result: Fixed result after removing wrong bug fix mysql-test/t/key.test: Added SHOW CREATE TABLE, which is the proper way to check for table definitions sql/table.cc: Reverted wrong bug fix. The intention with the original code was to show that MySQL treats the first given unique key as a primary key. Clients can use the marked primary key as a real primary key to validate row changes in case of conflicting updates. The ODBC driver (and other drivers) may also use this fact to optimize/check updates and handle conflicts. The marked key also shows what some engines, like InnoDB or NDB, will use as it's internal primary key. For checking if someone has declared a true PRIMARY KEY, one should use 'SHOW CREATE TABLE'
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main sql/ha_ndbcluster.cc: Auto merged
-
unknown authored
- added missing retrieval of hidden primary key
-
unknown authored
into mysql.com:/usr/local/mysql/tmp-5.0 include/my_global.h: Auto merged sql/item_sum.cc: Auto merged
-
unknown authored
strings/strtod.c: Fix Windows build problem, EOVERFLOW is defined in my_base.h on Windows.
-
unknown authored
into mysql.com:/home/tomash/src/mysql_ab/mysql-4.1-bug20152
-
unknown authored
When using a parameter bind MYSQL_TYPE_DATE in a prepared statement, the time part of the MYSQL_TIME buffer was written to zero in mysql_stmt_execute(). The param_store_date() function in libmysql.c worked directly on the provided buffer. Changed to use a copy of the buffer. libmysql/libmysql.c: fix for bug #20152 tests/mysql_client_test.c: added test for bug#20152
-
unknown authored
into mysql.com:/usr/local/mysql/mysql-5.0-release
-
unknown authored
In some functions dealing with strings and character sets, the wrong pointers were saved for restoration in THD::rollback_item_tree_changes(). This could potentially cause random corruption or crashes. Fixed by passing the original Item ** locations, not local stack copies. Also remove unnecessary use of default arguments. sql/item.cc: Function agg_item_charsets() now handles non-consequtive Item *'s. sql/item.h: Remove use of default argument. sql/item_cmpfunc.cc: Remove use of default argument. sql/item_func.cc: Remove use of default argument. sql/item_func.h: Function agg_item_charsets() now handles non-consequtive Item *'s. sql/item_strfunc.cc: Pass original Item **'s to agg_arg_charsets(), not local copies, to ensure proper restoration in THD::rollback_item_tree_changes(). sql/item_sum.cc: Remove use of default argument.
-
unknown authored
into mysql.com:/home/emurphy/src/bk-clean/mysql-5.0 configure.in: Auto merged
-
unknown authored
strings/strtod.c: Reverting previous change to include files (angle brackets instead of quotes) that broke windows build
-
unknown authored
into mysql.com:/home/my/mysql-5.0 mysql-test/r/func_sapdb.result: Auto merged mysql-test/r/func_time.result: Auto merged mysql-test/r/symlink.result: Auto merged mysql-test/t/func_sapdb.test: Auto merged mysql-test/t/func_time.test: Auto merged sql/item_timefunc.cc: Auto merged sql/sql_parse.cc: Auto merged
-
unknown authored
into mysql.com:/home/my/mysql-4.1
-
unknown authored
into mysql.com:/home/my/mysql-4.1
-
unknown authored
heap/hp_test1.c: Changed type from last commit mysql-test/mysql-test-run.sh: Fixed problem with running with --gdb and two masters Don't disable ndb becasue we run gdb mysql-test/t/mysqldump.test: Don't read ~/.my.cnf sql/ha_ndbcluster.cc: Portability fix
-
unknown authored
Disable old RPM strip my_global.h: Fixed wrong cast, which caused problems with gcc 4.0 and floats in prepared statements (Bug #19694) mysqlmanager.vcproj: Place output files in common release/debug directory server-tools/instance-manager/mysqlmanager.vcproj: Place output files in common release/debug directory include/my_global.h: Fixed wrong cast, which caused problems with gcc 4.0 and floats in prepared statements (Bug #19694) support-files/mysql.spec.sh: Disable old RPM strip
-
- 29 Jun, 2006 21 commits
-
-
unknown authored
into mysql.com:/home/my/mysql-4.1
-
unknown authored
into mysql.com:/home/my/mysql-5.0 include/my_global.h: Auto merged mysql-test/r/func_sapdb.result: Auto merged mysql-test/r/symlink.result: Auto merged mysql-test/t/func_sapdb.test: Auto merged mysys/my_handler.c: Auto merged sql/item_timefunc.cc: Auto merged sql/sql_parse.cc: Auto merged strings/strtod.c: Auto merged mysql-test/r/func_time.result: Manual merge mysql-test/t/func_time.test: Manual merge
-
unknown authored
into sunlight.local:/local_work/autopush/merge-4.1
-
unknown authored
hp_test2 now works again Fixed wrong cast, which caused problems with gcc 4.0 and floats in prepared statements (Bug #19694) heap/hp_test1.c: Portability fix heap/hp_test2.c: Added max_table_size (fixes that hp_test2 works again) include/my_global.h: Fixed wrong cast, which caused problems with gcc 4.0 (Bug #19694) mysys/my_handler.c: Added missing include file strings/strtod.c: Fixed include files
-
unknown authored
mysql-test/r/func_sapdb.result: Auto merged mysql-test/r/symlink.result: Auto merged mysql-test/t/func_sapdb.test: Auto merged sql/item_timefunc.cc: Auto merged sql/sql_parse.cc: Auto merged mysql-test/r/func_time.result: SCCS merged mysql-test/t/func_time.test: SCCS merged
-
unknown authored
into moonbone.local:/work/merge-5.0 sql/sql_select.cc: Auto merged strings/ctype-mb.c: Auto merged
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/5.0-merge sql/ha_ndbcluster.cc: Auto merged
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/5.0-merge
-
unknown authored
into mysql.com:/mnt/storeage/mysql-4.1_bug19298
-
unknown authored
into moonbone.local:/work/merge-4.1
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main sql/ha_ndbcluster.cc: Auto merged
-
unknown authored
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main sql/ha_ndbcluster.cc: Auto merged
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 sql/ha_ndbcluster.cc: manual merge
-
unknown authored
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/5.0-merge
-
unknown authored
include/my_sys.h: Auto merged mysql-test/r/federated.result: Auto merged mysql-test/t/federated.test: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/log.cc: Auto merged
-
unknown authored
Re-apply a patch by Knielsen in the 5.0.23 build clone: Replace port number by "SLAVE_PORT". mysql-test/r/federated.result: Re-apply a patch by Knielsen in the 5.0.23 build clone: Replace port number by "SLAVE_PORT". mysql-test/t/federated.test: Re-apply a patch by Knielsen in the 5.0.23 build clone: Replace port number by "SLAVE_PORT".
-
unknown authored
-
unknown authored
into mysql.com:/opt/local/work/mysql-5.0-runtime
-