- 25 Jul, 2006 1 commit
-
-
unknown authored
into mysql.com:/home/gluh/MySQL/Merge/5.0-kt
-
- 24 Jul, 2006 5 commits
-
-
unknown authored
into trift2.:/M50/merge-4.1-to-5.0 VC++Files/libmysqld/libmysqld.dsp: Auto merged VC++Files/libmysqld/libmysqld.vcproj: Auto merged VC++Files/libmysqld/libmysqld_ia64.dsp: Auto merged VC++Files/mysqldemb/mysqldemb.dsp: Auto merged VC++Files/sql/mysqld.dsp: Auto merged VC++Files/sql/mysqld.vcproj: Auto merged VC++Files/sql/mysqld_ia64.dsp: Auto merged VC++Files/sql/mysqldmax.dsp: Auto merged sql/field.cc: Merge a backport == Null-merge == "ul". sql/field.h: Merge a backport == Null-merge == "ul". sql/sql_locale.cc: Changes were already present (and even better) == Null-merge == "ul".
-
unknown authored
into bk-internal.mysql.com:/data0/bk/mysql-5.0-kt client/mysql.cc: Auto merged sql/share/errmsg.txt: Auto merged
-
unknown authored
into trift2.:/M50/merge-4.1-to-5.0 strings/strtod.c: Manual merge: Null merge with header file cleanup ("my_base.h" includes "my_global.h", so we do not need both).
-
unknown authored
into trift2.:/M50/merge-4.1-to-5.0 mysql-test/r/date_formats.result: Auto merged mysql-test/t/date_formats.test: Auto merged sql/item_strfunc.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_locale.cc: Auto merged sql/item_timefunc.cc: Merging by "ul", as asked in the original changeset. support-files/mysql.spec.sh: Manual merge, keeping alphabetic order.
-
unknown authored
into trift2.:/M50/merge-4.1-to-5.0 support-files/mysql.spec.sh: Auto merged configure.in: Manual - "use local".
-
- 21 Jul, 2006 4 commits
-
-
bk://anubis/mysql-5.0-enginesunknown authored
into xiphis.org:/home/antony/work2/merge/mysql-5.0 sql/handler.cc: Auto merged
-
unknown authored
into mysql.com:/home/hf/work/mysql-5.0.20950
-
unknown authored
on Windows. Code added to look for different names on Windows client/mysql_upgrade.c: added conditionally-compiled part to look for different names of tools on Windows
-
unknown authored
into mysql.com:/home/hf/work/mysql-5.0.19672 sql/share/errmsg.txt: Auto merged
-
- 20 Jul, 2006 2 commits
- 19 Jul, 2006 8 commits
-
-
unknown authored
into salvation.intern.azundris.com:/home/tnurnberg/mysql-5.0 sql/sql_insert.cc: Auto merged
-
unknown authored
mysql-test/r/mysqldump.result: manual mergies, part 2/2
-
unknown authored
- backport patch from 5.0 - "table" can be NULL in temporary fields used for type conversion sql/field.cc: table can be NULL in temporary fields used for type conversion. Store value in field as if db_low_byte_first was set. sql/field.h: table can be NULL in temporary fields used for type conversion. Store value in field as if db_low_byte_first was set.
-
unknown authored
into salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.0-merge support-files/mysql.spec.sh: Auto merged client/mysqldump.c: manual merge mysql-test/r/mysqldump.result: manual merge mysql-test/t/mysqldump.test: manual merge
-
unknown authored
REPLACE ... SELECT would require INSERT privileges on certain tables when SELECT really suffices. Require INSERT only on target table. mysql-test/r/insert_select.result: Bug#20989: View '(null).(null)' references invalid table(s)... on SQL SECURITY INVOKER Show that REPLACE ... SELECT requires INSERT privileges only on target table. (revised test with more view-fu) mysql-test/t/insert_select.test: Bug#20989: View '(null).(null)' references invalid table(s)... on SQL SECURITY INVOKER Show that REPLACE ... SELECT requires INSERT privileges only on target table. (revised test with more view-fu) sql/sql_insert.cc: Bug#20989: View '(null).(null)' references invalid table(s)... on SQL SECURITY INVOKER require SELECT rather than INSERT privs on tables that constitute the views we'll read
-
unknown authored
Post merge changes.
-
unknown authored
Added new "mysql_explain_log" man page Added missing install of "myisam_ftdump" man page Added missing install of "mysqlman" man page support-files/mysql.spec.sh: Added new "mysql_explain_log" man page Added missing install of "myisam_ftdump" man page Added missing install of "mysqlman" man page
-
unknown authored
into govinda.patg.net:/home/patg/mysql-build/mysql-5.0-bug18764.2 mysql-test/r/federated.result: "BUG #18764: Delete conditions causing inconsistencies in Federated tables" hand merge mysql-test/t/federated.test: "BUG #18764: Delete conditions causing inconsistencies in Federated tables" hand merge sql/ha_federated.cc: "BUG #18764: Delete conditions causing inconsistencies in Federated tables" hand merge
-
- 18 Jul, 2006 12 commits
-
-
unknown authored
into moonbone.local:/work/tmp_merge-5.0-opt-mysql client/mysql.cc: Auto merged mysql-test/r/date_formats.result: Auto merged mysql-test/r/func_str.result: Auto merged mysql-test/t/date_formats.test: Auto merged mysql-test/t/func_str.test: Auto merged sql/item_strfunc.cc: Auto merged sql/sql_class.cc: Auto merged sql/time.cc: Auto merged
-
unknown authored
into moonbone.local:/work/tmp_merge-4.1-opt-mysql mysql-test/r/date_formats.result: Auto merged mysql-test/t/date_formats.test: Auto merged sql/item_strfunc.cc: Auto merged sql/sql_class.cc: Auto merged
-
unknown authored
into moonbone.local:/work/tmp_merge-5.0-opt-mysql client/mysql.cc: Auto merged mysql-test/r/date_formats.result: Auto merged mysql-test/t/date_formats.test: Auto merged sql/time.cc: Manual merge
-
unknown authored
into moonbone.local:/work/tmp_merge-4.1-opt-mysql mysql-test/r/date_formats.result: Auto merged mysql-test/t/date_formats.test: Auto merged
-
unknown authored
into rama.(none):/home/jimw/my/mysql-5.0-17608 include/my_base.h: Auto merged mysql-test/r/merge.result: Auto merged mysql-test/t/merge.test: Auto merged sql/ha_myisammrg.cc: Auto merged sql/handler.cc: Auto merged
-
unknown authored
into rama.(none):/home/jimw/my/mysql-5.0-12673
-
unknown authored
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
-
unknown authored
into production.mysql.com:/usersnfs/abotchkov/mysql-5.0.mrg
-
unknown authored
-
unknown authored
Please use "ul" when merging this changeset to 5.0. sql/item_timefunc.cc: Fix a valgrind warning in type_date test. sql/sql_locale.cc: Fix a Windows build failure: "false" -> FALSE
-
unknown authored
into mysql.com:/home/hf/work/mysql-5.0.mrg libmysqld/embedded_priv.h: Auto merged sql-common/client.c: Auto merged include/mysql.h: merging libmysql/libmysql.c: merging libmysqld/lib_sql.cc: merging libmysqld/libmysqld.c: merging sql/sql_parse.cc: merging
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
-
- 17 Jul, 2006 8 commits
-
-
unknown authored
Removed logic in ha_federated::write_row, which checks field query ids in the loop which builds the query to run on the remote server. mysql-test/r/federated.result: "BUG #18764: Delete conditions causing inconsistencies in Federated tables" New test results for test that verifies that one can insert to rows using "insert into... select * from..", delete them by id, then immediately insert them in the same way they were originally inserted. mysql-test/t/federated.test: "BUG #18764: Delete conditions causing inconsistencies in Federated tables" New test that verifies that one can insert to rows using "insert into... select * from..", delete them by id, then immediately insert them in the same way they were originally inserted. sql/ha_federated.cc: "BUG #18764: Delete conditions causing inconsistencies in Federated tables" Removed the logic in ha_federated::write_row which checked the query id of each field and compared it to the thread query id. Each field has a query id, and the problem used to be that if I did an insert no fields specified, the field value would contain the last inserted value for that field. The way to work around this was to see if the query id for that field was the same as the current query id or of the rest of the field query ids. If it wasn't, that told me the query didn't have the field value specified. Somewhere from when I wrote that code to now the problem went away, and there was no longer the need for this logic. Also removed the bool "has_fields", which needs not exist and using table->s->fields is sufficient.
-
unknown authored
-
unknown authored
client/mysqldump.c: When dumping more than one database, make sure that the proper database is selected before restoring that database's views. Replaced hard-coded database name length with appropiate token. mysql-test/r/mysqldump.result: Added new result and corrected results for existing test cases. mysql-test/t/mysqldump.test: Added new case for dumping and restoring multiple databases each containing a view.
-
unknown authored
into rurik.mysql.com:/home/igor/mysql-5.0-opt mysql-test/r/subselect.result: Manual merge mysql-test/t/subselect.test: Manual merge
-
unknown authored
into rama.(none):/home/jimw/my/mysql-5.0-17485 client/mysql.cc: Auto merged
-
unknown authored
into olga.mysql.com:/home/igor/mysql-5.0-opt
-
unknown authored
1) When initializing a boolean variable, do not use string representations '"false"' and '"true"' but rather the boolean values 'false' and 'true'. 2) Add the module to the various Windows description files. VC++Files/libmysqld/libmysqld.dsp: Add "sql/sql_locale.cpp" with similar settings as the other files. VC++Files/libmysqld/libmysqld.vcproj: Add "sql/sql_locale.cpp" with similar settings as the other files. VC++Files/libmysqld/libmysqld_ia64.dsp: Add "sql/sql_locale.cpp" with similar settings as the other files. VC++Files/mysqldemb/mysqldemb.dsp: Add "sql/sql_locale.cpp" with similar settings as the other files. VC++Files/mysqldemb/mysqldemb.vcproj: Add "sql/sql_locale.cpp" with similar settings as the other files. VC++Files/mysqldemb/mysqldemb_ia64.dsp: Add "sql/sql_locale.cpp" with similar settings as the other files. VC++Files/sql/mysqld.dsp: Add "sql/sql_locale.cpp" with similar settings as the other files. VC++Files/sql/mysqld.vcproj: Add "sql/sql_locale.cpp" with similar settings as the other files. VC++Files/sql/mysqld_ia64.dsp: Add "sql/sql_locale.cpp" with similar settings as the other files. VC++Files/sql/mysqldmax.dsp: Add "sql/sql_locale.cpp" with similar settings as the other files. VC++Files/sql/mysqldmax_ia64.dsp: Add "sql/sql_locale.cpp" with similar settings as the other files. sql/sql_locale.cc: When initializing a boolean variable, do not use stringrepresentations '"false"' and '"true"' but rather the boolean values 'false' and 'true'.
-
unknown authored
In 5.0, this is already solved, so that is a null-merge ("ul"). strings/strtod.c: This file needs the definition of "EOVERFLOW", which is on some platforms (Windows, OpenBSD) provided only by "my_base.h". As this in turn includes "my_global.h", the include file name can be changed.
-