summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* WL#2286 - Compile MySQL w/YASSL supportunknown2005-06-1615-77/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge with latest yaSSL. extra/yassl/include/lock.hpp: Merge with latest yaSSL. extra/yassl/include/socket_wrapper.hpp: Merge with latest yaSSL. extra/yassl/mySTL/helpers.hpp: Merge with latest yaSSL. extra/yassl/src/lock.cpp: Merge with latest yaSSL. extra/yassl/src/log.cpp: Merge with latest yaSSL. extra/yassl/src/socket_wrapper.cpp: Merge with latest yaSSL. extra/yassl/src/ssl.cpp: Merge with latest yaSSL. extra/yassl/src/timer.cpp: Merge with latest yaSSL. extra/yassl/taocrypt/include/misc.hpp: Merge with latest yaSSL. extra/yassl/taocrypt/include/random.hpp: Merge with latest yaSSL. extra/yassl/taocrypt/include/types.hpp: Merge with latest yaSSL. extra/yassl/taocrypt/src/asn.cpp: Merge with latest yaSSL. extra/yassl/taocrypt/src/integer.cpp: Merge with latest yaSSL. extra/yassl/taocrypt/src/misc.cpp: Merge with latest yaSSL. extra/yassl/taocrypt/src/random.cpp: Merge with latest yaSSL.
* Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-06-152-2/+7
|\ | | | | | | | | | | | | into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0
| * Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-06-152-2/+7
| |\ | | | | | | | | | | | | | | | | | | into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0
| | * WL#2286 - Compile MySQL w/YASSL supportunknown2005-06-152-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for link failures on boxes with non-gnu compiler. Fix for compilation failure on hpux11. extra/yassl/taocrypt/src/misc.cpp: Adjust __HP_aCC value to solve compilation problem on hpux11. tools/Makefile.am: Add a dummy C++ file to mysqltestmanager to make libtool use a C++ linker: this lets mysqltestmanager link when using yaSSL and a non-gcc C++ compiler.
* | | Manual mergeunknown2005-06-154-9/+51
|\ \ \ | |/ / |/| | | | | | | | sql/field.cc: Auto merged
| * | cast.result, cast.test:unknown2005-06-154-9/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added test case for bug #11283. field.h, field.cc: Fixed bug #11283: wrong conversion from varchar to decimal. Added methods Field_string::val_decimal, Field_varstring::val_decimal, Field_blob::val_decimal. They are not inherited from the base class Field_longstr anymore. sql/field.cc: Fixed bug #11283: wrong conversion from varchar to decimal. Added methods Field_string::val_decimal, Field_varstring::val_decimal, Field_blob::val_decimal. They are not inherited from the base class Field_longstr anymore. sql/field.h: Fixed bug #11283: wrong conversion from varchar to decimal. Added methods Field_string::val_decimal, Field_varstring::val_decimal, Field_blob::val_decimal. They are not inherited from the base class Field_longstr anymore. mysql-test/t/cast.test: Added test case for bug #11283. mysql-test/r/cast.result: Added test case for bug #11283.
* | | Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0unknown2005-06-153-4/+38
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into deer.(none):/home/hf/work/mysql-5.0.10632 strings/decimal.c: Auto merged
| * | | Fix for bug #10632 (CEILING returns wrong result)unknown2005-06-153-4/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/func_math.result: test result fixed mysql-test/t/func_math.test: test case added strings/decimal.c: handling of round_digit changed - we have to check all the digits after the point if round_digit is 0
* | | | Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0unknown2005-06-154-2/+24
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into deer.(none):/home/hf/work/mysql-5.0.10337 strings/decimal.c: Auto merged
| * | | | Fix for bug #10337 (cast(NULL DECIMAL) crashes the server)unknown2005-06-154-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/cast.result: test result fixed mysql-test/t/cast.test: test case added sql/item_func.cc: checks for NULL added strings/decimal.c: we need to return specified 'scale' for the rounded decimal
* | | | | Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-06-1536-128/+134
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0 sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_cmpfunc.cc: Auto merged
| * | | | | Added comment after Serg's reviewunknown2005-06-151-0/+2
| | | | | |
| * | | | | Fix for bug #11174 (can't determine hostname under Windows 64-bit)unknown2005-06-151-13/+13
| | | | | |
| * | | | | Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-06-1435-115/+119
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0
| | * \ \ \ \ Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-06-1335-115/+119
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0
| | | * | | | | fixes for windows 64-bit compiler warningsunknown2005-06-1335-115/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | heap/hp_hash.c: fix for windows 64-bit compiler warnings heap/hp_update.c: fix for windows 64-bit compiler warnings mysys/default.c: fix for windows 64-bit compiler warnings mysys/default_modify.c: fix for windows 64-bit compiler warnings mysys/mf_iocache.c: fix for windows 64-bit compiler warnings mysys/mf_keycache.c: fix for windows 64-bit compiler warnings mysys/my_alloc.c: fix for windows 64-bit compiler warnings mysys/my_getopt.c: fix for windows 64-bit compiler warnings mysys/my_mmap.c: fix for windows 64-bit compiler warnings mysys/my_once.c: fix for windows 64-bit compiler warnings mysys/string.c: fix for windows 64-bit compiler warnings sql-common/client.c: fix for windows 64-bit compiler warnings sql/field.cc: fix for windows 64-bit compiler warnings sql/gstream.cc: fix for windows 64-bit compiler warnings sql/ha_myisam.cc: fix for windows 64-bit compiler warnings sql/ha_myisammrg.cc: fix for windows 64-bit compiler warnings sql/item.cc: fix for windows 64-bit compiler warnings sql/item.h: fix for windows 64-bit compiler warnings sql/item_cmpfunc.cc: fix for windows 64-bit compiler warnings sql/password.c: fix for windows 64-bit compiler warnings sql/set_var.h: fix for windows 64-bit compiler warnings strings/ctype-big5.c: fix for windows 64-bit compiler warnings strings/ctype-bin.c: fix for windows 64-bit compiler warnings strings/ctype-cp932.c: fix for windows 64-bit compiler warnings strings/ctype-eucjpms.c: fix for windows 64-bit compiler warnings strings/ctype-mb.c: fix for windows 64-bit compiler warnings strings/ctype-simple.c: fix for windows 64-bit compiler warnings strings/ctype-sjis.c: fix for windows 64-bit compiler warnings strings/ctype-uca.c: fix for windows 64-bit compiler warnings strings/ctype-ucs2.c: fix for windows 64-bit compiler warnings strings/ctype-ujis.c: fix for windows 64-bit compiler warnings strings/ctype-utf8.c: fix for windows 64-bit compiler warnings strings/ctype.c: fix for windows 64-bit compiler warnings strings/decimal.c: fix for windows 64-bit compiler warnings strings/xml.c: fix for windows 64-bit compiler warnings
* | | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-06-151-2/+13
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
| * \ \ \ \ \ \ \ Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-06-151-2/+13
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-5.0
| | * | | | | | | Merge mysql.com:/space/my/mysql-4.1unknown2005-06-151-2/+13
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-5.0-build support-files/mysql.spec.sh: Auto merged
| | | * | | | | | | - Do not build the RPMs statically on i386 by default, only when adding eitherunknown2005-06-141-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "--with static" or "--define '_with_static 1'" to the RPM build options. Static linking really only makes sense when linking against the specially patched glibc 2.2.5. support-files/mysql.spec.sh: - Do not build statically on i386 by default, only when adding either "--with static" or "--define '_with_static 1'" to the RPM build options. Static linking really only makes sense when linking against the specially patched glibc 2.2.5.
* | | | | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-06-153-1/+41
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
| * | | | | | | | | join_nested.result, join_nested.test:unknown2005-06-153-1/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a teast case for bug #11284. sql_select.cc: Fixed bug #11284. Optimization with empty inner table currently cannot be used in the case of nested outer join. sql/sql_select.cc: Fixed bug #11284. Optimization with empty inner table currently cannot be used in the case of nested outer join. mysql-test/t/join_nested.test: Added a teast case for bug #11284.
* | | | | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-06-1511-22/+118
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
| * | | | | | | | | Merge rurik.mysql.com:/home/igor/mysql-5.0unknown2005-06-153-1/+21
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into rurik.mysql.com:/home/igor/dev/mysql-5.0-0 sql/sql_select.cc: Auto merged
| | * | | | | | | | join_outer.result, join_outer.test:unknown2005-06-153-1/+21
| | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a test case for bug #11285. sql_select.cc: Fixed bug #11285. The problem occurred with Item_equal in an 'on expression' that was evaluated to false. sql/sql_select.cc: Fixed bug #11285. The problem occurred with Item_equal in an 'on expression' that was evaluated to false. mysql-test/t/join_outer.test: Added a test case for bug #11285. mysql-test/r/join_outer.result: Added a test case for bug #11285.
| * | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-06-153-8/+18
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
| | * | | | | | | | Bug #11221 Mysqld does not automatically reconnecting to cluster with ↵unknown2005-06-153-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cluster restart
| * | | | | | | | | Merge mysql.com:/home/timka/mysql/src/5.0-virginunknown2005-06-151-0/+4
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/timka/mysql/src/5.0-dbg
| * | | | | | | | | Fix for BUG#11211 "GROUP BY doesn't work correctly"unknown2005-06-156-13/+79
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the GROUP BY clause contains a column reference that can be resolved to both an aliased column in the SELECT list, and to a column in the FROM clause, the group column is resolved to the column in the FROM clause (for ANSI conformance). However, it may be so that the user's intent is just the other way around, and he/she gets the query results grouped by a completely different column than expexted. This patch adds a warning in such cases that tells the user that there is potential ambiguity in the group column. sql/sql_select.cc - Added a warning when a GROUP column is ambiguous due to that there is a column reference with the same name both in the SELECT and FROM clauses. In this case we resolve to the column in FROM clause and warn the user of a possible ambiguity. - More extensive comments. - Changed the function to return bool instead of int (as in other places). mysql-test/t/group_by.test Added test for BUG#11211. mysql-test/r/group_by.result Added test for BUG#11211. mysql-test/r/group_by.result: Import patch 11211.diff mysql-test/t/group_by.test: Import patch 11211.diff sql/sql_select.cc: Import patch 11211.diff BitKeeper/etc/ignore: Added ndb/src/dummy.cpp to the ignore list mysql-test/r/alias.result: Added warning for potentially ambiguous column. mysql-test/r/having.result: Added warning for potentially ambiguous column.
* | | | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-06-1515-64/+238
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
| * | | | | | | | Fixes some of the failing test cases for Netware.unknown2005-06-151-0/+4
| |/ / / / / / /
| * | | | | | | Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-06-153-47/+59
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/cps/mysql/trees/mysql-5.0
| | * | | | | | | rename: store_to_string -> store_to_protocol_packetunknown2005-06-153-48/+57
| | | | | | | | |
| | * | | | | | | Fix for Bug #11200 show instance options returns garbage instead of log optionsunknown2005-06-141-0/+3
| | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | server-tools/instance-manager/commands.cc: Send an empty string in the option_value column, if no option value is given
| * | | | | | | fix of BUG#11111 fixunknown2005-06-153-16/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/item.h: revrited as recursive sql/sql_select.cc: real_type is virtual tests/mysql_client_test.c: check results abd delete views
| * | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0unknown2005-06-153-2/+63
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-bug3-5.0
| | * | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-06-153-2/+63
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into moonbone.local:/work/mysql-5.0-bug-11111
| | | * | | | | Fix 11 "fetch from view returns wrong data"unknown2005-06-153-2/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wrong method for creating temporary field was choosen, which results in sending int field with int header but lonlong data. Test case is added to mysql_client_test.c because client library is required to test the bug. tests/mysql_client_test.c: Test case for bug#11111 "fetch from view returns wrong data" sql/sql_select.cc: Fix bug #11111 "fetch from view returns wrong data" sql/item.h: Fix bug #11111 "fetch from view returns wrong data"
| * | | | | | | prohibit opening Query cache for SP cursors (BUG#9715)unknown2005-06-145-5/+77
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/query_cache.result: testing cursors in SP with QC testing suspicious but working using selects in function with QC mysql-test/t/query_cache.test: testing cursors in SP with QC testing suspicious but working using selects in function with QC sql/sp_head.h: method for prohibiting of QC using SP query sql/sp_rcontext.cc: prohibit opening Query cache for SP cursors sql/sp_rcontext.h: constructor moved to .cc file to be able to use methods from lex_keeper
| * | | | | | Final patch to the bug #11314 (HAVING DEFAULT hangs)unknown2005-06-141-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/item.cc: it's safer not to reassign arg member
| * | | | | | Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0unknown2005-06-143-9/+22
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into deer.(none):/home/hf/work/mysql-5.0.clean
| | * | | | | Addition to fix for bug #11314 (test case wasn't complete)unknown2005-06-142-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/func_default.result: test result fixed mysql-test/t/func_default.test: test case fixed
| | * | | | | Fix for bug #11314 (HAVING DEFAULT() hangs)unknown2005-06-142-9/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/t/func_default.test: test result fixed sql/item.cc: code simplified using real_item() method, error returning added
* | | | | | | Added order by for failing ps_7ndb testunknown2005-06-147-9/+9
| | | | | | |
* | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-06-141-0/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
| * | | | | | Relaxed type checking to allow int to real coercionunknown2005-06-101-0/+4
| | | | | | |
* | | | | | | Merge mysql.com:/home/timka/mysql/src/5.0-virginunknown2005-06-147-7/+114
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/timka/mysql/src/5.0-bug-11044
| * \ \ \ \ \ \ Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0unknown2005-06-147-7/+114
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0-tmp
| | * | | | | | | Bug #10213 mysqldump crashes when dumping VIEWsunknown2005-06-102-2/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added testcase for this bug mysql-test/r/mysqldump.result: Updated test result mysql-test/t/mysqldump.test: Added testcase
| | * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-06-105-5/+38
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0 sql/sql_show.cc: Auto merged