- 14 Jun, 2007 8 commits
-
-
unknown authored
into trift2.:/MySQL/M50/push-5.0
-
unknown authored
into trift2.:/MySQL/M41/push-4.1
-
unknown authored
into trift2.:/MySQL/M50/push-5.0 sql/item_func.cc: Manual merge: thread identity check was gone from this place in main 5.0.
-
unknown authored
into mysql.com:/d2/hf/mrg/mysql-5.0-opt
-
unknown authored
into magare.gmz:/home/kgeorge/mysql/work/valgrind-errs-merge-5.0-opt
-
unknown authored
-
unknown authored
into mysql.com:/d2/hf/mrg/mysql-5.0-opt client/mysqltest.c: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_cmpfunc.cc: Auto merged sql/mysqld.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_yacc.yy: Auto merged mysql-test/r/innodb_mysql.result: merging mysql-test/t/innodb_mysql.test: merging sql/sql_select.cc: merging
-
unknown authored
into mysql.com:/d2/hf/mrg/mysql-4.1-opt
-
- 13 Jun, 2007 21 commits
-
-
unknown authored
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build BitKeeper/triggers/post-commit: Auto merged
-
unknown authored
BitKeeper/triggers/post-commit: send to correct address.
-
unknown authored
scripts/make_win_bin_dist: add missing backslash
-
unknown authored
was erroneously converted to double, while the result of ROUND(<decimal expr>, <int literal>) was preserved as decimal. As a result of such a conversion the value of ROUND(D,A) could differ from the value of ROUND(D,val(A)) if D was a decimal expression. Now the result of the ROUND function is never converted to double if the first argument is decimal. mysql-test/r/type_decimal.result: Added a test case for bug #28980. mysql-test/t/type_decimal.test: Added a test case for bug #28980.
-
unknown authored
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
-
unknown authored
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build
-
unknown authored
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build configure.in: Auto merged
-
unknown authored
into trift2.:/MySQL/M50/push-5.0
-
unknown authored
into trift2.:/MySQL/M50/push-5.0 configure.in: Auto merged netware/comp_err.def: Auto merged netware/isamchk.def: Auto merged netware/isamlog.def: Auto merged netware/libmysql.def: Auto merged netware/my_print_defaults.def: Auto merged netware/myisam_ftdump.def: Auto merged netware/myisamchk.def: Auto merged netware/myisamlog.def: Auto merged netware/myisampack.def: Auto merged netware/mysql.def: Auto merged netware/mysql_install_db.def: Auto merged netware/mysql_test_run.def: Auto merged netware/mysql_waitpid.def: Auto merged netware/mysqladmin.def: Auto merged netware/mysqlbinlog.def: Auto merged netware/mysqlcheck.def: Auto merged netware/mysqld.def: Auto merged netware/mysqld_safe.def: Auto merged netware/mysqldump.def: Auto merged netware/mysqlimport.def: Auto merged netware/mysqlshow.def: Auto merged netware/mysqltest.def: Auto merged netware/pack_isam.def: Auto merged netware/perror.def: Auto merged netware/replace.def: Auto merged netware/resolve_stack_dump.def: Auto merged netware/resolveip.def: Auto merged sql/Makefile.am: Keep the existing version, the only difference is formatting.
-
unknown authored
into trift2.:/MySQL/M50/merge-5.0 configure.in: Auto merged libmysqld/lib_sql.cc: Auto merged netware/comp_err.def: Auto merged netware/isamchk.def: Auto merged netware/isamlog.def: Auto merged netware/libmysql.def: Auto merged netware/myisam_ftdump.def: Auto merged netware/myisamchk.def: Auto merged netware/myisamlog.def: Auto merged netware/myisampack.def: Auto merged netware/mysql.def: Auto merged netware/mysql_install_db.def: Auto merged netware/mysql_test_run.def: Auto merged netware/mysql_waitpid.def: Auto merged netware/mysqladmin.def: Auto merged netware/mysqlbinlog.def: Auto merged netware/mysqlcheck.def: Auto merged netware/mysqld.def: Auto merged netware/mysqld_safe.def: Auto merged netware/mysqldump.def: Auto merged netware/mysqlimport.def: Auto merged netware/mysqlshow.def: Auto merged netware/mysqltest.def: Auto merged netware/pack_isam.def: Auto merged netware/perror.def: Auto merged netware/replace.def: Auto merged netware/resolve_stack_dump.def: Auto merged netware/resolveip.def: Auto merged sql/item_func.cc: Auto merged netware/my_print_defaults.def: 5.0 already has 128 kB stack size. sql/Makefile.am: Manual merge.
-
unknown authored
into trift2.:/MySQL/M41/push-4.1
-
unknown authored
Improved check for thread identity in the "embedded" case, provided by Monty. This finishes the fixes for bug#27078. sql/item_func.cc: Improved check for thread identity in the "embedded" case, provided by Monty. This finishes the fixes for bug#27078.
-
unknown authored
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
-
unknown authored
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
-
unknown authored
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1
-
unknown authored
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0 configure.in: Auto merged
-
unknown authored
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0 configure.in: null-merge version number change
-
unknown authored
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
-
unknown authored
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-post-commit BitKeeper/triggers/post-commit: Remove dev-public@ / dev-bugs@ e-mail, is now handled differently. Merge fix for 5.0.
-
unknown authored
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1
-
unknown authored
https://inside.mysql.com/wiki/MySQL's_Code_Reviews_Published_Externally BitKeeper/triggers/post-commit: 1) Add additional method of detecting merge changesets. 2) Remove code sending e-mail to dev-public@ or dev-bugs@. 3) Change code sending e-mail to commits@ to send to dev-private@ if a specific file is present in the BK root directory, denoting this tree as private.
-
- 12 Jun, 2007 6 commits
-
-
unknown authored
Aligned headers to include with Unix 'make install' scripts/make_win_bin_dist: Aligned headers to include with Unix 'make install'
-
unknown authored
-
unknown authored
into magare.gmz:/home/kgeorge/mysql/autopush/B28992-5.0-opt
-
unknown authored
- fixed wrong test case for bug 20903 - closed the dangling connections in trigger.test - GET_LOCK() and RELEASE_LOCK() now produce more detailed log - fixed an omission in GET_LOCK() : assign the thread_id when acquiring the lock. mysql-test/r/trigger.result: Bug #28992: test case updated mysql-test/t/trigger.test: Bug #28992: test case updated. dangling connections closed. sql/item_func.cc: Bug #28992: - GET_LOCK() and RELEASE_LOCK() now produce more detailed log - fixed an omission in GET_LOCK() : assign the thread_id when acquiring the lock.
-
unknown authored
into magare.gmz:/home/kgeorge/mysql/autopush/B28934-5.0-opt
-
unknown authored
Sometimes a parameter slot may not get a value because of the protocol data being plain wrong. Such cases should be detected and handled by returning an error. Fixed by checking data stream constraints where possible (like maximum length) and reacting to the case where a value cannot be constructed. sql/sql_prepare.cc: Bug #28934: - check for a parameter slot not being set because of wrong data - check if the length read from the stream is not greater than the maximum length of the field tests/mysql_client_test.c: Bug #28934: test case
-
- 11 Jun, 2007 2 commits
-
-
unknown authored
When the INSERT .. ON DUPLICATE KEY UPDATE has to update a matched row but the new data is the same as in the record then it returns as if no rows were inserted or updated. Nevertheless the row is silently updated. This leads to a situation when zero updated rows are reported in the case when data has actually been changed. Now the write_record function updates a row only if new data differs from that in the record. sql/sql_insert.cc: Bug#28904: INSERT .. ON DUPLICATE was silently updating rows when it shouldn't. Now the write_record function updates a row only if new data differs from that in the record. mysql-test/r/insert_update.result: Added a test case for the bug#28904: INSERT .. ON DUPLICATE was silently updating rows when it shouldn't. mysql-test/t/insert_update.test: Added a test case for the bug#28904: INSERT .. ON DUPLICATE was silently updating rows when it shouldn't.
-
unknown authored
into trift2.:/MySQL/M50/push-5.0
-
- 09 Jun, 2007 3 commits
-
-
unknown authored
-
unknown authored
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
-
unknown authored
changed bytes_received, bytes_sent status variables to longlong sql/mysqld.cc: changed bytes_received, bytes_sent status variables to longlong sql/sql_class.h: changed bytes_received, bytes_sent status variables to longlong sql/sql_show.cc: changed bytes_received, bytes_sent status variables to longlong sql/structs.h: changed bytes_received, bytes_sent status variables to longlong
-