database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-26 01:44:06 +03:00
Code Activity
55,601 Commits 3,143 Branches 363 Tags
04d72f8682ea8f18b5edf9e8cc7d05470897e1fe
Commit Graph

82 Commits

Author SHA1 Message Date
Andrei Elkin
2618337eb6 merging 5.1 -> 5.1 rpl. 3 of 4 conflicts are resolved similarly to 6.0->6.0-rpl merging. 
mysql_upgrade results changed due to the error messesge of mysqlcheck has changed.
 2008-11-12 19:51:47 +02:00
Davi Arnaut
1585368047 Merge from mysql-5.0-bugteam into mysql-5.1-bugteam 2008-10-24 10:50:59 -02:00
Marc Alff
e76bb8c665 Bug#36768 (partition_info::check_partition_info() reports mal formed 
warnings)

Before this fix, several places in the code would raise a warning with an
error code 0, making it impossible for a stored procedure, a connector,
or a client application to trigger logic to handle the warning.
Also, the warning text was hard coded, and therefore not translated.

With this fix, new errors numbers have been created to represent these
warnings, and the warning text is coded in the errmsg.txt file.
 2008-10-06 14:36:15 -06:00
He Zhenxing
6e86e05823 Merge 5.1 main -> 5.1-rpl 2008-09-06 08:51:17 +08:00
Alexey Botchkov
ab1ce67eb0 merging fix 2008-08-26 14:50:32 +05:00
Alexey Botchkov
d7445d0493 merging fixes 2008-08-26 14:21:07 +05:00
msvensson@pilot.mysql.com
95d9608d3e Fix paths in test and result files 2008-04-03 21:40:10 +02:00
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
4ea7377356 Post-merge fixes 2008-03-14 17:45:14 +01: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/mgluh.(none)
fc1ae07785 test case fix 2008-03-03 15:02:34 +04:00
gluh@mysql.com/eagle.(none)
2f5abfd3ef fixed problem with embedded server 2008-02-29 17:58:35 +04:00
gluh@eagle.(none)
1616c68bde Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
 2008-02-29 16:58:20 +04:00
gluh@mysql.com/eagle.(none)
4d582db8ea test fix 2008-02-29 16:56:41 +04:00
gluh@mysql.com/eagle.(none)
931bdedbc2 after merge fix 2008-02-29 15:04:00 +04:00
gluh@eagle.(none)
df5fbf5ae0 Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
 2008-02-29 14:05:38 +04:00
gluh@mysql.com/eagle.(none)
13bb7e0a22 Bug#32167 another privilege bypass with DATA/INDEX DIRECORY(ver 4.1,5.0) 
added new function test_if_data_home_dir() which checks that
path does not contain mysql data home directory.
Using of mysql data home directory in
DATA DIRECTORY & INDEX DIRECTORY is disallowed.
 2008-02-29 13:55:00 +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
40a78cd390 After merge fix. 2007-11-12 15:15:16 +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
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
b1eeb52cda Merge fix of updated test result 2006-12-18 14:38:12 +01:00
msvensson@maint1.mysql.com
8c3dab2f5d Merge maint1.mysql.com:/data/localhome/msvensson/mysql-5.0-maint 
into  maint1.mysql.com:/data/localhome/msvensson/mysql-5.1-new-maint
 2006-12-18 14:27:51 +01:00
msvensson@maint1.mysql.com
6cd4a816bc Use MYSQLTEST_VARDIR variable 2006-12-18 10:22:48 +01:00
tsmith/tim@siva.hindu.god
b2ec2103a3 Merge siva.hindu.god:/usr/home/tim/m/bk/50 
into  siva.hindu.god:/usr/home/tim/m/bk/51
 2006-12-14 17:48:44 -07:00
tsmith/tim@siva.hindu.god
17fb4c5cbd Post-merge fix to symlink.result 2006-12-14 17:47:55 -07:00
tsmith/tim@siva.hindu.god
9788de036b Merge siva.hindu.god:/usr/home/tim/m/bk/50 
into  siva.hindu.god:/usr/home/tim/m/bk/51
 2006-12-14 17:03:44 -07: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
070ff2ac72 Merge kpdesk.mysql.com:/home/thek/dev/bug17489/my50-bug17498 
into  kpdesk.mysql.com:/home/thek/dev/bug17489/my51-bug17498
 2006-12-14 13:53:13 +01: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
ingo@chilla.local
db0e7774aa Merge chilla.local:/home/mydev/mysql-5.0-ateam 
into  chilla.local:/home/mydev/mysql-5.1-ateam
 2006-07-06 13:18:00 +02:00
ingo@mysql.com
a21071d912 Merge mysql.com:/home/mydev/mysql-4.1-bug14400 
into  mysql.com:/home/mydev/mysql-5.0-ateam
 2006-07-05 11:20:10 +02:00
evgen@moonbone.local
3cc6d95d18 Merge 2006-06-30 02:03:09 +04:00
svoj@may.pils.ru
ffd8ed1716 BUG#1662 - ALTER TABLE LIKE ignores DATA/INDEX DIRECTPORY 
Produce a warning if DATA/INDEX DIRECTORY is specified in
ALTER TABLE statement.

Ignoring of these options is documented in the symbolic links
section of the manual.
 2006-06-27 22:22:43 +05:00