- 31 Jul, 2006 2 commits
-
-
unknown authored
into bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
-
unknown authored
Problem: Unescaping of '\' characters didn't work when processing N'xxx'. Fix: using get_text() instead of get_token() when scanning nationa strings. mysql-test/r/ctype_utf8.result: Adding test case mysql-test/t/ctype_utf8.test: Adding test case sql/sql_lex.cc: Fixing to process national strings using get_tex(), i.e. the same way with usual strings, to make unescaping work.
-
- 29 Jul, 2006 6 commits
-
-
unknown authored
into mysql.com:/Users/kent/mysql/bk/mysql-5.0 configure.in: Auto merged
-
unknown authored
into mysql.com:/Users/kent/mysql/bk/mysql-4.1 configure.in: Auto merged
-
unknown authored
Corrected typo configure.in: Corrected typo
-
unknown authored
tests/mysql_client_test.c: Fix after manual merge: add test for bug#21206.
-
unknown authored
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-merge configure.in: Auto merged man/Makefile.am: Auto merged mysys/my_bitmap.c: Auto merged scripts/make_binary_distribution.sh: Auto merged sql/field.cc: Auto merged sql/sql_locale.cc: Auto merged support-files/mysql.spec.sh: Auto merged mysql-test/t/mysqlbinlog.test: Manual merge. sql/sql_select.cc: Manual merge.
-
unknown authored
Converted "udf_example.cc" to C, avoids C++ runtime lib dependency (bug#21336) sql/Makefile.am: "udf_example.cc" converted to C, avoids C++ runtime lib dependency (bug#21336) mysql-test/t/udf.test: "udf_example.cc" converted to C, avoids C++ runtime lib dependency (bug#21336) sql/udf_example.c: Changes to be strict ansi, except long long
-
- 28 Jul, 2006 8 commits
-
-
unknown authored
into mysql.com:/Users/kent/mysql/bk/mysql-4.1 configure.in: Auto merged scripts/make_binary_distribution.sh: Auto merged support-files/mysql.spec.sh: SCCS merged
-
unknown authored
Man page for mysqld command move to section 8 (bug#21220) configure.in: Man page for mysqld command move to section 8 (bug#21220) man/Makefile.am: Man page for mysqld command move to section 8 (bug#21220)
-
unknown authored
Man page for "mysqld" command move to section 8 (bug#21220) scripts/make_binary_distribution.sh: Man page for "mysqld" command move to section 8 (bug#21220)
-
unknown authored
Man page for "mysqld" command move to section 8 (bug#21220) support-files/mysql.spec.sh: Man page for "mysqld" command move to section 8 (bug#21220)
-
unknown authored
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new netware/BUILD/mwasmnlm: Auto merged netware/BUILD/mwccnlm: Auto merged netware/BUILD/mwldnlm: Auto merged
-
unknown authored
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new sql/sql_select.cc: Auto merged
-
unknown authored
Renamed variable, to avoid name clash with macro "rem_size" on AIX 5.3 and "/usr/include/sys/xmem.h" (bug#17648) asn.cpp, asn.hpp: Avoid name clash with NAME_MAX sql/sql_select.cc: Renamed variable, to avoid name clash with macro "rem_size" on AIX 5.3 and "/usr/include/sys/xmem.h" (bug#17648) extra/yassl/taocrypt/src/asn.cpp: Avoid name clash with NAME_MAX extra/yassl/taocrypt/include/asn.hpp: Avoid name clash with NAME_MAX
-
unknown authored
into maint1.mysql.com:/data/localhome/tsmith/bk/global-50
-
- 27 Jul, 2006 5 commits
-
-
unknown authored
into bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
-
unknown authored
mysys/my_bitmap.c: Revert the change forced during null-merge.
-
unknown authored
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-main sql/sql_select.cc: Null-merge tests/mysql_client_test.c: Null-merge
-
unknown authored
Too many cursors (more than 1024) could lead to memory corruption. This affects both, stored routines and C API cursors, and the threshold is per-server, not per-connection. Similarly, the corruption could happen when the server was under heavy load (executing more than 1024 simultaneous complex queries), and this is the reason why this bug is fixed in 4.1, which doesn't support cursors. The corruption was caused by a bug in the temporary tables code, when an attempt to create a table could lead to a write beyond allocated space. Note, that only internal tables were affected (the tables created internally by the server to resolve the query), not tables created with CREATE TEMPORARY TABLE. Another pre-condition for the bug is TRUE value of --temp-pool startup option, which, however, is a default. The cause of a bug was that random memory was overwritten in bitmap_set_next() due to out-of-bound memory access. mysys/my_bitmap.c: Local 'bitmap_size' is measured in bytes, no need to multiply it by 8. sql/sql_select.cc: Clear the temp_pool_slot bit only if we have set it previously. tests/mysql_client_test.c: Add test case for bug#21206: memory corruption when too many cursors are opened at once.
-
unknown authored
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-main VC++Files/sql/mysqld.vcproj: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/sp.result: Auto merged mysql-test/r/warnings.result: Auto merged mysql-test/t/warnings-master.opt: Auto merged mysql-test/t/warnings.test: Auto merged sql/handler.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_parse.cc: Auto merged
-
- 26 Jul, 2006 2 commits
-
-
unknown authored
into siva.hindu.god:/usr/home/tim/m/bk/global-50 mysql-test/r/func_time.result: Auto merged mysql-test/t/func_time.test: Auto merged sql/field.cc: Auto merged
-
unknown authored
Too many cursors (more than 1024) could lead to memory corruption. This affects both, stored routines and C API cursors, and the threshold is per-server, not per-connection. Similarly, the corruption could happen when the server was under heavy load (executing more than 1024 simultaneous complex queries), and this is the reason why this bug is fixed in 4.1, which doesn't support cursors. The corruption was caused by a bug in the temporary tables code, when an attempt to create a table could lead to a write beyond allocated space. Note, that only internal tables were affected (the tables created internally by the server to resolve the query), not tables created with CREATE TEMPORARY TABLE. Another pre-condition for the bug is TRUE value of --temp-pool startup option, which, however, is a default. The cause of a bug was that random memory was overwritten in bitmap_set_next() due to out-of-bound memory access. mysys/my_bitmap.c: Local 'bitmap_size' is measured in bytes, no need to multiply it by 8. sql/sql_select.cc: Clear the temp_pool_slot bit only if we have set it previously.
-
- 25 Jul, 2006 6 commits
-
-
unknown authored
into bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
-
unknown authored
The fix is: if user has privileges to view fields and user has any (insert,select,delete,update) privileges on underlying view then 'show fields' and select from I_S.COLUMNS table are sucsessful. mysql-test/r/information_schema_db.result: Bug#20543 select on information_schema strange warnings, view, different schemas/users test result mysql-test/t/information_schema_db.test: Bug#20543 select on information_schema strange warnings, view, different schemas/users test case sql/sql_acl.cc: Bug#20543 select on information_schema strange warnings, view, different schemas/users checked that user has privileges on underlying view and if it's true set allowed_show to true for top view. sql/sql_show.cc: Bug#20543 select on information_schema strange warnings, view, different schemas/users removed unnecessary rights check.'tables->allowed_show' check is used instead sql/sql_view.cc: Bug#20543 select on information_schema strange warnings, view, different schemas/users skip the check of SHOW_VIEW_ACL privilege on underlying view. It is done later during execution of find_field_in_table_ref function. sql/table.h: Bug#20543 select on information_schema strange warnings, view, different schemas/users 'allowed_show' is set during rights check for view. If true then user has privileges for 'show create view', etc
-
unknown authored
(Re-apply a patch from the general tree to the clone.) mysql-test/mysql-test-run.pl: "mysql-test-run.pl" must write a "Logging:" line for the evaluation of RPM build tests. (Re-apply a patch from the general tree to the clone.)
-
unknown authored
BUG#20850: Assert during slave shutdown in many rpl_* tests This patch has already been applied to 5.1. sql/slave.cc: BUG#20850: Assert during slave shutdown in many rpl_* tests This patch has already been applied to 5.1.
-
unknown authored
into mysql.com:/home/hf/work/mysql-5.0.mrg libmysqld/lib_sql.cc: Auto merged tests/mysql_client_test.c: merging
-
unknown authored
into mysql.com:/home/gluh/MySQL/Merge/5.0-kt
-
- 24 Jul, 2006 10 commits
-
-
unknown authored
into trift2.:/M41/push-4.1
-
unknown authored
into trift2.:/M41/push-4.1 sql/field.cc: Auto merged sql/sql_locale.cc: Changes were already present (and even better) == Null-merge == "ul".
-
unknown authored
- Send confusing output to /dev/null mysql-test/t/mysqlbinlog.test: Send confusing error messages to /dev/null so they don't appear in erro log if test case fails
-
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".
-
unknown authored
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
-
unknown authored
Filter out strange control characters, messes up logs netware/BUILD/mwasmnlm: Filter out strange control characters, messes up logs netware/BUILD/mwccnlm: Filter out strange control characters, messes up logs netware/BUILD/mwldnlm: Filter out strange control characters, messes up logs
-
- 23 Jul, 2006 1 commit
-
-
unknown authored
into mysql.com:/usr/home/ram/work/4.1.b16327 sql/field.cc: Auto merged mysql-test/r/func_time.result: merging mysql-test/t/func_time.test: merging
-