- 08 Feb, 2007 2 commits
-
-
unknown authored
into mysql.com:/home/ram/work/b25301/b25301.5.0 mysql-test/r/date_formats.result: Auto merged sql-common/my_time.c: Merging. Reverted fix for 19370 DateTime datatype in MySQL has two bugs in it as it's not a bug.
-
unknown authored
The 0000 year is valid. The ISO standard for "Representation of dates and times" says: "Calendar years are numbered in ascending order according to the Gregorian calendar by values in the range [0000] to [9999]." Reverted fix for 21789: DATETIME with 0000-00-00 11:22:33 should be invalid, but is accepted as it's not a bug. Fix for 19370: DateTime datatype in MySQL has two bugs in it will be reverted during 4.1 -> 5.0 merging as it was pushed to the 5.0 tree. mysql-test/r/date_formats.result: Fix for bug #25301: Non-zero dates with year 0000 are invalid - reverted fix for bug #21789: DATETIME with 0000-00-00 11:22:33 should be invalid, but is accepted sql-common/my_time.c: Fix for bug #25301: Non-zero dates with year 0000 are invalid - reverted fix for bug #21789: DATETIME with 0000-00-00 11:22:33 should be invalid, but is accepted
-
- 06 Feb, 2007 21 commits
-
-
unknown authored
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint vio/vio.c: Auto merged vio/viossl.c: Auto merged
-
unknown authored
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
-
unknown authored
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint vio/viosslfactories.c: Auto merged
-
unknown authored
- Send output from 'ERR_print_errors_fp' to DBUG_FILE if --debug is used vio/viosslfactories.c: Send output from 'ERR_print_errors_fp' to DBUG_FILE if --debug is used
-
unknown authored
-
unknown authored
- Small difference in output from 'X509_NAME_Oneline' between OpenSSL and yaSSL. OpenSSL uses an extension that allow's the email adress of the cert holder. - Imported patch for yaSSL "add email to DN output" extra/yassl/taocrypt/src/asn.cpp: Import patch yassl.diff mysql-test/r/openssl_1.result: Update result file mysql-test/t/openssl_1.test: Update test to include "emailAddress=" tag in the required SUBJECT for grant.
-
unknown authored
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint configure.in: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/range.result: Auto merged mysql-test/t/range.test: Auto merged mysys/default.c: Auto merged scripts/mysqld_multi.sh: Auto merged sql/field.h: Auto merged sql/item_timefunc.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/slave.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_prepare.cc: Merfge backport
-
unknown authored
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint mysql-test/mysql-test-run.pl: Auto merged sql/item_timefunc.cc: Auto merged
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint Makefile.am: Auto merged configure.in: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysys/default.c: Auto merged sql/item.cc: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_cmpfunc.h: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged mysql-test/r/select.result: Manual merge mysql-test/t/select.test: Manual merge
-
unknown authored
into pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint mysys/default.c: Auto merged sql/mysqld.cc: Auto merged sql/sql_prepare.cc: Auto merged
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint sql/sql_prepare.cc: Auto merged
-
unknown authored
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint mysql-test/mysql-test-run.pl: Auto merged mysql-test/t/disabled.def: Auto merged
-
unknown authored
into pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
-
unknown authored
into pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint sql/sql_prepare.cc: Auto merged
-
unknown authored
- Don't give mysqld the --log-bin argument if .opt file contains --skip-log-bin - Enable flush2 test mysql-test/mysql-test-run.pl: Don't give mysqld the --log-bin argument if .opt file contains --skip-log-bin Don't pass mysqld --binlog-format=s if --skip-log-bin mysql-test/t/disabled.def: Enable flush2 mysql-test/t/flush2-master.opt: Use --skip-log-bin in flush2 to test flush without bin logging
-
unknown authored
into mysql.com:/home/ram/work/b23782/b23782.5.0 sql/sql_analyse.cc: Auto merged
-
unknown authored
- Backport fix from 5.0 sql/sql_prepare.cc: Avoid problems with -no-strict-aliasing in gcc 4.0+
-
unknown authored
analyse We have to call fix_fields() for procedure analyse' arguments as they may not be fixed in some circumstances. (as the crash appears when mysqld starts skipping binlog, a test case will be added when we can --skip-bin-log in -master.opt) sql/sql_analyse.cc: Fix for bug #23782: Stored procedures: crash if variable in procedure analyse - call fix_fields() if arguments are not fixed.
-
unknown authored
into mysql.com:/usr/home/ram/work/bug23938/my41-bug23938 sql/item_timefunc.cc: Auto merged
-
unknown authored
into mysql.com:/usr/home/ram/work/bug23938/my50-bug23938 sql/item_timefunc.cc: Auto merged
-
unknown authored
into mysql.com:/usr/home/ram/work/bug23938/my50-bug23938 sql/item_timefunc.cc: Auto merged mysql-test/r/cast.result: SCCS merged mysql-test/t/cast.test: SCCS merged
-
- 05 Feb, 2007 3 commits
- 03 Feb, 2007 1 commit
-
-
unknown authored
-
- 02 Feb, 2007 9 commits
-
-
unknown authored
into chilla.local:/home/mydev/mysql-5.0-axmrg sql/handler.cc: Auto merged sql/examples/ha_tina.cc: Auto merged sql/examples/ha_tina.h: Auto merged sql/mysqld.cc: Auto merged mysql-test/Makefile.am: Manual merged
-
unknown authored
into chilla.local:/home/mydev/mysql-5.0-axmrg sql/item_func.cc: Auto merged
-
unknown authored
into chilla.local:/home/mydev/mysql-4.1-axmrg
-
unknown authored
-
unknown authored
-
unknown authored
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
-
unknown authored
added valgrind.supp to EXTRA_SCRIPTS(for pushbuild)
-
unknown authored
into chilla.local:/home/mydev/mysql-5.0-axmrg include/my_pthread.h: Auto merged include/thr_alarm.h: Auto merged mysys/my_pthread.c: Auto merged mysys/my_thr_init.c: Auto merged
-
unknown authored
-
- 01 Feb, 2007 4 commits
-
-
unknown authored
into chilla.local:/home/mydev/mysql-5.0-axmrg BitKeeper/deleted/.del-valgrind.supp: Delete: mysql-test/valgrind.supp mysql-test/r/ps.result: SCCS merged mysql-test/r/symlink.result: Null merged mysql-test/t/ps.test: SCCS merged mysql-test/t/symlink.test: Null merged sql/field_conv.cc: Null merged sql/mysqld.cc: Null merged vio/viosslfactories.c: Null merged
-
unknown authored
into chilla.local:/home/mydev/mysql-5.0-axmrg BUILD/SETUP.sh: Auto merged configure.in: Auto merged
-
unknown authored
into mysql.com:/home/ram/work/b26012/b26012.4.1 sql/field.h: Auto merged
-
unknown authored
into mysql.com:/home/ram/work/b26012/b26012.5.0 sql/field.h: Auto merged
-