istruewing@stella.local
8c0300dae9
Merge stella.local:/home2/mydev/mysql-5.1-ateam
...
into stella.local:/home2/mydev/mysql-5.1-axmrg
2008-03-20 12:22:02 +01:00
mattiasj@witty.
d733351148
Bug#35305: partition_symlink test failures
...
Updated the test due to bug 32167
Corrected spelling of error message
2008-03-17 16:11:26 +01:00
antony@pcg5ppc.xiphis.org
91e44529bd
Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.1
...
into pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.1
2008-03-14 11:13:54 -07:00
istruewing@stella.local
ed89b81b3f
Post-merge fix. Moved the symlink handling from sql_parse.cc here.
2008-03-14 14:03:47 +01:00
istruewing@stella.local
eabe082d6f
Manual merge
2008-03-14 12:02:11 +01:00
gluh@mysql.com/eagle.(none)
2f5abfd3ef
fixed problem with embedded server
2008-02-29 17:58:35 +04:00
gluh@mysql.com/eagle.(none)
9d42a09675
Bug#32167 another privilege bypass with DATA/INDEX DIRECORY(3rd version for 5.1)
...
added new function test_if_data_home_dir() which checks that
path does not contain mysql data home directory.
Using of 'mysql data home'/'any db name' in
DATA DIRECTORY & INDEX DIRECTORY is disallowed
2008-02-28 16:46:52 +04:00
svoj@mysql.com/june.mysql.com
1d0ea2d043
BUG#25677 - With --skip-symbolic-links option on, DATA DIRECTORY
...
clause is silently ignored
When symbolic links are disabled by command line option or
NO_DIR_IN_CREATE sql mode, CREATE TABLE silently ignores
DATA/INDEX DIRECTORY options.
With this fix a warning is issued when symbolic links are disabled.
2007-12-07 17:40:42 +04:00
svoj@june.mysql.com
d03491e8f9
Merge mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-5.1-engines
2007-11-12 21:55:53 +04:00
svoj@june.mysql.com
9799d6c479
Merge mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-5.0-engines
2007-11-12 21:54:04 +04:00
svoj@mysql.com/june.mysql.com
ed8f506d29
symlink.test, symlink.result:
...
Use proper variable for test.
2007-11-12 21:52:30 +04:00
svoj@june.mysql.com
162d70cb02
Merge mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-5.1-engines
2007-11-12 15:26:37 +04:00
svoj@june.mysql.com
5e44309422
Merge mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-5.0-engines
2007-11-12 15:16:00 +04:00
svoj@mysql.com/june.mysql.com
a6def1f4ab
Merge mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-4.0
...
into mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-4.1-engines
2007-11-12 15:02:42 +04:00
svoj@mysql.com/june.mysql.com
d06e2f9223
BUG#32111 - Security Breach via DATA/INDEX DIRECORY and RENAME TABLE
...
RENAME TABLE against a table with DATA/INDEX DIRECTORY overwrites
the file to which the symlink points.
This is security issue, because it is possible to create a table with
some name in some non-system database and set DATA/INDEX DIRECTORY
to mysql system database. Renaming this table to one of mysql system
tables (e.g. user, host) would overwrite the system table.
Return an error when the file to which the symlink points exist.
2007-11-06 18:09:33 +04:00
gshchepa/uchum@gleb.loc
b434254e0e
symlink.test, symlink.result:
...
Minor fix for test case of bug #29325 to make emb test happy.
2007-07-14 01:34:46 +05:00
gshchepa/uchum@gleb.loc
1674d8dc35
Merge gleb.loc:/home/uchum/work/bk/5.0-opt
...
into gleb.loc:/home/uchum/work/bk/5.1-opt
2007-07-13 19:36:10 +05:00
gkodinov/kgeorge@magare.gmz
d6ad4e6eb9
disabled the output of the full path in tesing bug 29325
2007-07-13 16:32:29 +03:00
gkodinov/kgeorge@magare.gmz
2b8e462637
Bug 29325: moved the test from create_not_windows to symlink.
2007-07-13 13:56:22 +03:00
tsmith@quadxeon.mysql.com
43b4b044f7
Fix for valgrind errors in test: require symlink support for partition_not_windows.test
2007-04-25 20:21:55 +02:00
gluh@mysql.com/eagle.(none)
010dc0b55c
Valgrind error fixes
...
Notes:
This patch doesn't fix all issues in the tree and we need jani's fix for that
This patch shoud not be merged into 5.0
2007-02-01 18:00:24 +04:00
msvensson@maint1.mysql.com
6cd4a816bc
Use MYSQLTEST_VARDIR variable
2006-12-18 10:22:48 +01:00
tsmith/tim@siva.hindu.god
9cbe0621b8
Merge siva.hindu.god:/usr/home/tim/m/bk/41
...
into siva.hindu.god:/usr/home/tim/m/bk/50
2006-12-14 16:51:12 -07:00
tsmith/tim@siva.hindu.god
8e5be1ad97
myisam.result: a test was moved from the .test file, but the results were not updated.
2006-12-14 16:23:54 -07:00
thek@kpdesk.mysql.com
c9622dfb0a
Merge kpdesk.mysql.com:/home/thek/dev/bug17489/my41-bug17498
...
into kpdesk.mysql.com:/home/thek/dev/bug17489/my50-bug17498
2006-12-14 13:38:09 +01:00
thek@kpdesk.mysql.com
29f72a0ba1
Bug#17498 failed to put data file in custom directory use "data directory" option
...
- When this bug was corrected it changed the behavior
for data/index directory in the myisam test case.
- This patch moves the OS depending tests to a non-windows
test file.
2006-12-14 13:23:31 +01:00
msvensson@neptunus.(none)
3d5f530caa
Merge neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var
...
into neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var-integration
2006-01-24 08:43:34 +01:00
msvensson@neptunus.(none)
09ec2919a1
Make it possible to run mysql-test-run.pl with default test suite in different vardir.
2006-01-24 08:30:54 +01:00
kent@mysql.com
8fd7e5f922
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
2005-12-08 16:15:27 +01:00
kent@mysql.com
e8198e799e
mysqld.cc:
...
Bug#14960, reverted code to make symdir work on Windows
symlink.test:
Disabled test case on Windows
2005-12-08 16:13:53 +01:00
monty@mysql.com
15d48525af
Merge mysql.com:/home/my/mysql-4.1
...
into mysql.com:/home/my/mysql-5.0
2005-07-28 17:09:54 +03:00
monty@mysql.com
3c12d0ae54
Added end marker for tests to make future merges easier
2005-07-28 03:22:47 +03:00
jimw@mysql.com
f7c01cfb76
Merged from 4.1
2005-03-03 15:01:46 -08:00
jimw@mysql.com
96e034f50e
Fix symlink test to avoid filenames with paths
2005-03-03 12:36:27 -08:00
ingo@mysql.com
2d9909aef9
Bug#8306 - TRUNCATE leads to index corruption
...
After merge fix.
The bugfix results in a different error message in this situation.
2005-03-02 11:49:50 +01:00
jimw@mysql.com
3ecabaa9f7
Don't try to create a symlink if the DATA DIRECTORY specified for a table
...
is the same as the normal datadir for that database. (Bug #8707 )
2005-02-23 13:59:04 -08:00
jimw@mysql.com
20552486e5
Fix test results from merge, and fix the symlink test which had an
...
out-of-sync test and result.
2005-01-18 15:05:16 -08:00
monty@mysql.com
9ad75d8c75
After merge fixes
2005-01-18 05:07:22 +02:00
bell@sanja.is.com.ua
f42deb58e6
changed to moderm syntax (after merge fix)
2004-02-17 02:26:35 +02:00
monty@mysql.com
e0cc6799ec
Merge with 4.0.17
2003-12-17 17:35:34 +02:00
monty@mysql.com
f995a5f4aa
Fix autoincrement for signed columns (Bug #1366 )
...
Fixed problem with char > 128 in QUOTE() function. (Bug #1868 )
Disable creation of symlinks if my_disable_symlink is set
Fixed searching of TEXT with end space. (Bug #1651 )
Fixed caching bug in multi-table-update where same table was used twice. (Bug #1711 )
Fixed problem with UNIX_TIMESTAMP() for timestamps close to 0. (Bug #1998 )
Fixed timestamp.test
2003-12-12 22:26:58 +02:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
fcf96dbb18
WorkLog#1323
...
Deprecate the use of TYPE=... Preferred syntax is ENGINE=
2003-12-10 04:31:42 +00:00
monty@mysql.com
7c6113a39f
Merge key cache structures to one
...
Fixed compiler warnings (IRIX C compiler and VC++)
2003-11-20 22:06:25 +02:00
monty@narttu.mysql.fi
a444a3449f
Simplified 'wrong xxx name' error messages by introducing 'general' ER_WRONG_NAME error
...
Cleaned up (and disabled part of) date/time/datetime format patch. One can't anymore change default read/write date/time/formats.
This is becasue the non standard datetime formats can't be compared as strings and MySQL does still a lot of datetime comparisons as strings
Changed flag argument to str_to_TIME() and get_date() from bool to uint
Removed THD from str_to_xxxx functions and Item class.
Fixed core dump when doing --print-defaults
Move some common string functions to strfunc.cc
Dates as strings are now of type my_charset_bin instead of default_charset()
Introduce IDENT_QUOTED to not have to create an extra copy of simple identifiers (all chars < 128)
Removed xxx_FORMAT_TYPE enums and replaced them with the old TIMESTAMP_xxx enums
Renamed some TIMESTAMP_xxx enums to more appropriate names
Use defines instead of integers for date/time/datetime string lengths
Added to build system and use the new my_strtoll10() function.
2003-11-03 14:01:59 +02:00
monty@narttu.mysql.fi
77a70a0a24
merge with 4.0.15
2003-08-29 13:44:35 +03:00
monty@narttu.mysql.fi
2c1f1206c3
Better fix for myisamchk --sort-index on windows
...
Fixed deadlock bug when doing resize of key buffer while key buffer was in active use
2003-08-25 17:19:44 +03:00
monty@mashka.mysql.fi
2263e3e51f
Merge with 4.0.14
2003-08-11 22:44:43 +03:00
monty@narttu.mysql.fi
c21728f8c8
Cleaner implementation if INSERT ... SELECT with same tables
...
Tests cleanup (put drop database first in tests)
2003-07-03 11:55:36 +03:00
monty@mashka.mysql.fi
1f6ecc0cd3
Changed mysql-test to print warnings for not existing table to DROP TABLE
...
Cleaned up test; Removed wrong DROP TABLE commands and use standard table and database names.
changed store_warning() -> push_warning_print()
2003-01-06 01:48:59 +02:00
monty@hundin.mysql.fi
5fedd2dda7
Fix for IO_CACHE.
...
Portability fixes.
2001-11-28 03:47:15 +02:00