summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* mysqltest improvements, updates after merge + test for 5.0unknown2005-09-018-22/+20
| | | | | | | | | | | | | | | | | | | client/mysqltest.c: Fixes after merge mysql-test/r/type_newdecimal.result: Update results after correction of testcase mysql-test/t/flush_read_lock_kill.test: Found extra delimiter mysql-test/t/kill.test: Found extra delimiter mysql-test/t/rpl_loaddata.test: Found extra delimiter mysql-test/t/rpl_sp.test: Found extra delimiter mysql-test/t/strict.test: Convert "!$1292" to "--error 1292" mysql-test/t/type_newdecimal.test: Missing ;
* Merge neptunus.(none):/home/msvensson/mysql/bug11316/my41-bug11316unknown2005-09-0126-397/+1575
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/bug11316/my50-bug11316 mysql-test/mysql-test-run.pl: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/rpl_flush_log_loop.result: Auto merged mysql-test/t/create.test: Auto merged mysql-test/t/drop.test: Auto merged mysql-test/t/innodb.test: Auto merged mysql-test/t/rpl000001.test: Auto merged mysql-test/t/rpl_EE_error.test: Auto merged mysql-test/t/rpl_deadlock.test: Auto merged mysql-test/t/rpl_drop_temp.test: Auto merged mysql-test/t/rpl_error_ignored_table.test: Auto merged mysql-test/t/rpl_flush_log_loop.test: Auto merged mysql-test/t/rpl_loaddata.test: Auto merged mysql-test/t/rpl_rotate_logs.test: Auto merged client/mysqltest.c: Manual merge mysql-test/r/mysqltest.result: Manual merge mysql-test/t/flush.test: Manual merge mysql-test/t/mysqltest.test: Manual merge mysql-test/t/rpl_change_master.test: Manual merge mysql-test/t/rpl_until.test: Manual merge
| * Fix compiler warnings for mysqltest.cunknown2005-09-011-4/+2
| | | | | | | | | | | | client/mysqltest.c: Fix warnings Remove unused vars
| * Bug #3131 mysqltest fails on $2=$1 assignment in testunknown2005-09-013-7/+42
| | | | | | | | | | | | | | | | | | | | client/mysqltest.c: Fix function var_copy to make it possible to assign one variable to another. ex: let $1=$2 mysql-test/r/mysqltest.result: Update test result mysql-test/t/mysqltest.test: Add test cases for variable to variable assignment
| * Bug #12471 mysqltest, --error within loop affects wrong statementunknown2005-09-013-2/+30
| | | | | | | | | | | | | | | | | | | | | | | | - Move clearing of expected errors client/mysqltest.c: Move clear of expected errors to the query loop so that the expected error is reset even when the query is retrieved from the q_lines cache. mysql-test/r/mysqltest.result: Update test results mysql-test/t/mysqltest.test: Add test for bug#12471
| * Remove syntax !$<err_no> to set an expected error codeunknown2005-08-313-42/+9
| | | | | | | | | | | | | | | | | | | | | | | | Use !<err_no> instead client/mysqltest.c: Remove syntax !$<err_no> to set an expected error code mysql-test/r/mysqltest.result: Update test result mysql-test/t/mysqltest.test: Uncomment tests for the deprecated syntax
| * BUG#11316: mysqltest, problems when assigning value with '#' to $variableunknown2005-08-3114-477/+539
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add stricter checking of syntax in mysqltest client/mysqltest.c: Stricter checking of syntax in mysqltest. mysql-test/r/mysqltest.result: Update test results mysql-test/t/create.test: Remove extra ; mysql-test/t/create_select_tmp.test: Remove extra ; mysql-test/t/drop.test: Remove extra ; mysql-test/t/flush.test: Remove extra ; mysql-test/t/handler.test: Remove extra ; mysql-test/t/innodb.test: Remove extra ; mysql-test/t/mysqltest.test: Add more tests for replace, replace_columns, comments with commands and sync_with_master mysql-test/t/rpl000001.test: Remove extra ; mysql-test/t/rpl_EE_error.test: Remove extra ; mysql-test/t/rpl_drop.test: Remove extra ; mysql-test/t/rpl_error_ignored_table.test: Remove extra ; mysql-test/t/rpl_loaddata.test: Remove extra ;
| * BUG#10267 mysqltest, wrong number of loops when a script is sourced within a ↵unknown2005-08-163-1/+105
| | | | | | | | | | | | | | | | | | | | | | loop client/mysqltest.c: Don't open a sourced file more than once as it will already have been read into the q_lines cache mysql-test/r/mysqltest.result: Added tests for source command inside of while loop mysql-test/t/mysqltest.test: Added tests for source command inside of while loop
| * BUG#11316 mysqltest, problems when assigning value with '#' to $variableunknown2005-07-1517-143/+1124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed problem, only detect comment if the # is on start of line AND starting line of the current command. - Wrote tests for most of the mysqltest commands, added stricter checking of correct syntax. client/mysqltest.c: Updated mysql test to do stricter checking of syntax. For example when the number of arguments to a command is known, everything else is "junk" => die. Better checking of argument types. Added better debug printouts. Added improved printouts when wrong syntax is detected. Fix two bugs where mysqltest could not detect end of comamnd properly, as described in bug#11316 Fix segfault when performing too many source commands. Fix segfault when doing too many while loop levels. Add printout of line number in die Remove lineno and \n in all strings passed to die function. Decrese BLOCK_STACK_DEPTH from 32 to 16, does any test use more than 1 level? mysql-test/mysql-test-run.pl: export MYSQL_TEST environment variable, used from msyqltest.test mysql-test/mysql-test-run.sh: export MYSQL_TEST environment variable, used from msyqltest.test mysql-test/r/mysqltest.result: Updated test results mysql-test/r/rpl_flush_log_loop.result: Updated test result. Approved by lars mysql-test/t/innodb-deadlock.test: Correct wrong syntax Superfluos ; mysql-test/t/innodb-lock.test: Correct wrong syntax Superfluos ; mysql-test/t/mysqltest.test: Add several new tests for mysqltest. Foxus on detecting wrong syntax in test files. Use exec with expected error to execute test scripts that will kill mysqltest Change some negative test that were previously commented out to use the above method. mysql-test/t/ndb_autodiscover2.test: Correct wrong syntax Superfluos ; mysql-test/t/rpl_change_master.test: Correct wrong syntax Superfluos ; mysql-test/t/rpl_deadlock.test: Correct wrong syntax Superfluos ; mysql-test/t/rpl_drop_temp.test: Correct wrong syntax Superfluos ; mysql-test/t/rpl_flush_log_loop.test: Fix after detecting wrong syntax, missing ; Discussed with lars. mysql-test/t/rpl_insert_id.test: Missing ; mysql-test/t/rpl_rotate_logs.test: Correct wrong syntax Superfluos ; mysql-test/t/rpl_until.test: Missing delimiter mysql-test/include/mysqltest_while.inc: New file to test too many while levels
* | Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-07-083-2/+34
|\ \ | | | | | | | | | | | | | | | | | | into igor-inspiron.creware.com:/home/igor/mysql-5.0
| * \ Merge igor-inspiron.creware.com:/home/igor/mysql-5.0unknown2005-07-083-2/+34
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into igor-inspiron.creware.com:/home/igor/dev/mysql-5.0-0 mysql-test/r/ctype_utf8.result: Auto merged
| | * | ctype_utf8.test:unknown2005-07-083-2/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a test case for bug #11484. hp_hash.c: Fixed bug #11484. This bug in the function hp_rec_key_cmp resulted in wrong comparison of varchar multibyte keys if the bytes after string values happened to be different. This caused wrong results for queries returning DISTINCT varchar fields in multibyte charsets (e.g. in utf8). heap/hp_hash.c: Fixed bug #11484. This bug in the function hp_rec_key_cmp resulted in wrong comparison of varchar multibyte keys if the bytes after string values happened to be different. This caused wrong results for queries returning DISTINCT varchar fields in multibyte charsets (e.g. in utf8). mysql-test/t/ctype_utf8.test: Added a test case for bug #11484.
* | | | Merge mysql.com:/space/my/mysql-5.0.9-cloneunknown2005-07-082-0/+3
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-5.0
| * | | - manual merge of the addition of including mysqlt-test/t/*.defunknown2005-07-082-0/+3
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | mysql-test/Makefile.am: - manual merge scripts/make_binary_distribution.sh: - manual merge
| | * | - added mysql-test/t/*.def to the source and binary distributionsunknown2005-07-082-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/Makefile.am: - added mysql-test/t/*.def to the source distribution and make sure that "make install" installs it, too. scripts/make_binary_distribution.sh: - added mysql-test/t/*.def to the binary distribution
* | | | Merge mysql.com:/usr/home/ram/work/mysql-5.0-releaseunknown2005-07-083-10/+35
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/ram/work/mysql-5.0
| * | | a fix (bug #11809: ps_1general.test fails on QNX).unknown2005-07-082-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/ps_1general.result: a fix (bug #11809: ps_1general.test fails on QNX). replace Max_data_length column value with '#' as well mysql-test/t/ps_1general.test: a fix (bug #11809: ps_1general.test fails on QNX). replace Max_data_length column value with '#' as well
| * | | Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-gcaunknown2005-07-071-4/+31
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release mysql-test/lib/mtr_cases.pl: Auto merged
| | * | | mtr_cases.pl:unknown2005-07-071-4/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added support for the disabled.def file mysql-test/lib/mtr_cases.pl: Added support for the disabled.def file
* | | | | Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-07-0711-78/+96
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-5.0
| * \ \ \ \ Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-07-0710-78/+72
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into deer.(none):/home/hf/work/mysql-5.0.clean mysql-test/r/show_check.result: Auto merged mysql-test/r/sql_mode.result: Auto merged
| | * | | | | Fix for bug #8449(Silent column changes)unknown2005-07-0710-78/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/show_check.result: test result fixed mysql-test/r/sql_mode.result: test result fixed mysql-test/r/type_decimal.result: test result fixed mysql-test/r/type_float.result: test result fixed mysql-test/r/type_newdecimal.result: test result fixed mysql-test/t/type_decimal.test: test fixed mysql-test/t/type_float.test: test fixed mysql-test/t/type_newdecimal.test: test case added sql/share/errmsg.txt: error messages added sql/sql_parse.cc: now precision/scale parameters are handled in required way
| * | | | | | Merge neptunus.(none):/home/msvensson/mysql/bug11635/mysql-5.0unknown2005-07-072-0/+24
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0
| | * | | | | Merge to 5.0unknown2005-07-073-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/ctype_utf8.result: Correct wrong merge mysql-test/r/show_check.result: Correct wrong merge Fix output from new test for SHOW CREATE TABLE, default '0' is not displayed in 5.0 mysql-test/r/sql_mode.result: Correct wrong merge
| | * | | | | Manual merge of BUG#11635 whihc is already in 5.0unknown2005-07-074-9/+33
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/t/show_check.test: Auto merged mysql-test/r/ctype_utf8.result: Manual merge(without filemerge tool!) mysql-test/r/show_check.result: Manual merge mysql-test/r/sql_mode.result: Manual merge sql/sql_show.cc: Manual merge
| | | * | | | | BUG#11635 mysqldump exports TYPE instead of USING for HASH Cluster indexesunknown2005-07-075-15/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Change output from SHOW CREATE TABLE to use USING instead of TYPE mysql-test/r/ctype_utf8.result: Update test results mysql-test/r/show_check.result: Update test results mysql-test/r/sql_mode.result: Update test results mysql-test/t/show_check.test: Add test for BUG#11635 sql/sql_show.cc: Change TYPE to USING as output from SHOW CREATE TABLE
* | | | | | | | Merge mysql.com:/space/my/mysql-5.0.9-cloneunknown2005-07-072-0/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | / / / / | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-5.0
| * | | | | | - Updated the sp-security result set after updating the testunknown2005-07-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/sp-security.result: - Updated the result set
| * | | | | | - fixed the "sp-security" test case: drop any possible already existing ↵unknown2005-07-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | table to avoid failing if a previous test failure left the t1 table around mysql-test/t/sp-security.test: - drop any possible already existing table to avoid failing if a previous test failure left the t1 table around
* | | | | | | Fix for bug #11708 (real function returns wrongly rounded decimal)unknown2005-07-074-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/type_newdecimal.result: test result fixed mysql-test/t/type_newdecimal.test: test case added sql/item_func.cc: Item_real_func::val_decimal implemented sql/item_func.h: Item_real_func::val_decimal declared
* | | | | | | Fix for bug #10891 (string->decimal conversion crashes server)unknown2005-07-073-5/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/type_newdecimal.result: test result fixed mysql-test/t/type_newdecimal.test: test case added strings/decimal.c: new_point can be 0, and this case should be handled separately
* | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0unknown2005-07-0715-50/+55
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0 sql/item_strfunc.cc: Auto merged
| * \ \ \ \ \ \ Merge bk-internal:/home/bk/mysql-5.0unknown2005-07-063-21/+30
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean VC++Files/tests/mysql_client_test.dsp: Merge with fix to link debug version against debug yassl library
| | * \ \ \ \ \ \ Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-releaseunknown2005-07-073-21/+30
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-5.0
| | | * | | | | | Mergeunknown2005-07-062-16/+24
| | | |\ \ \ \ \ \ | | | | | |_|/ / / | | | | |/| | | |
| | | | * | | | | mtr_misc.pl:unknown2005-07-062-21/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Corrected appending of .exe to Windows executables Don't alter read only @_ in foreach loop mysql-test-run.pl: Improved cleanup of binlogs Use separate log file for second master Corrected Windows paths to executables mysql-test/mysql-test-run.pl: Improved cleanup of binlogs Use separate log file for second master Corrected Windows paths to executables mysql-test/lib/mtr_misc.pl: Corrected appending of .exe to Windows executables Don't alter read only @_ in foreach loop
| | | * | | | | | Mergeunknown2005-07-062-5/+6
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/mysql-test-run.pl: Auto merged
| | | | * | | | | mysql-test-run.pl:unknown2005-07-062-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle case where SHELL isn't set in Cygwin mysql_client_test.dsp: Put output into the "client_debug" and "client_release" directories VC++Files/tests/mysql_client_test.dsp: Put output into the "client_debug" and "client_release" directories mysql-test/mysql-test-run.pl: Handle case where SHELL isn't set in Cygwin
| * | | | | | | | Fix typos that crept into ChangeSet for fix for Bug #11045.unknown2005-07-062-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/ha_federated.cc: Fix typo sql/sql_insert.cc: Fix typo
| * | | | | | | | Merge jwinstead@production.mysql.com:my/mysql-5.0-11045unknown2005-07-0613-31/+27
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean VC++Files/sql/mysqld.dsp: Auto merged sql/ha_federated.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_union.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/table.cc: Auto merged sql/item_strfunc.cc: SCCS merged
| | * | | | | | | Fix another .dsp trying to link debug binary against release version of yasslunknown2005-06-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VC++Files/tests/mysql_client_test.dsp: Link debug version against debug yassl library
| | * | | | | | | Clean up warnings and build problems on Windows. (Bug #11045)unknown2005-06-1812-29/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VC++Files/sql/mysqld.dsp: Link debug server against debug yassl sql/examples/ha_archive.cc: Fix type for variables used to store number of rows Add cast when reading current position sql/examples/ha_archive.h: Fix variables used to store rows to ha_rows sql/ha_federated.cc: Remove unused variables, fix type of variable used to store query id sql/item_strfunc.cc: Remove unused variables sql/sql_acl.cc: Remove unused variables sql/sql_lex.cc: Add casts to fix type used for counting number of rows sql/sql_lex.h: Fix size of options to be ulong again sql/sql_insert.cc: Fix type of query id value sql/sql_union.cc: Cast value for number of rows to ha_rows sql/sql_yacc.yy: Remove unused variable sql/table.cc: Add casts for handling key_part lengths
* | | | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0unknown2005-07-064-12/+118
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
| * | | | | | | | Look in the directory above the executable for the my.cnf/ini, on Windows, asunknown2005-07-061-12/+80
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the new installer and GUI tools expect. (Bug #10419) Also, dynamically bind to GetSystemWindowsDirectory() so that it works on all platforms. (Bug #5354) mysys/default.c: Dynamically bind to GetSystemWindowsDirectory() or emulate it, and also look in directory above the executable to find my.cnf/ini on Windows.
| * | | | | | | Merge igor-inspiron.creware.com:/home/igor/mysql-5.0unknown2005-07-063-0/+38
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into igor-inspiron.creware.com:/home/igor/dev/mysql-5.0-0
| | * | | | | | | view.result, view.test:unknown2005-07-063-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a test case for bug #6120. sql_view.cc: Fixed bug #6120. The SP cache must be invalidated when a view is altered. sql/sql_view.cc: Fixed bug #6120. The SP cache must be invalidated when a view is altered. mysql-test/t/view.test: Added a test case for bug #6120. mysql-test/r/view.result: Added a test case for bug #6120.
* | | | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1unknown2005-07-063-1/+26
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0 mysql-test/r/func_str.result: Auto merged mysql-test/t/func_str.test: Auto merged sql/item_strfunc.cc: Auto merged
| * | | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1unknown2005-07-061-0/+11
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-4.1
| | * \ \ \ \ \ \ \ Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-07-061-0/+11
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.1
| * | | | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1unknown2005-07-063-1/+26
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-4.1