mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 05:52:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
27336 commits 2784 branches 343 tags 1.6 GiB
Commit graph

13022 commits

Author SHA1 Message Date
jimw@mysql.com
305b58b8a2 Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-10-26 15:47:56 -07:00
jimw@mysql.com
607c129737 Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-10-26 14:11:08 -07:00
brian@zim.(none)
ff6cfe6d66 Change in gis test to allow NDB to be able to call generic tests. Fix for Archive so that ALTER TABLE doesn't issue a warning. Also added test case for alter table. 2005-10-26 13:55:08 -07:00
brian@zim.(none)
22644b5f1c Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zim.(none):/home/brian/mysql/mysql-5.0
 2005-10-26 09:08:44 -07:00
SergeyV@selena.
0eacb6fb35 Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  selena.:H:/MYSQL/src/#14137-mysql-5.0
 2005-10-26 19:05:02 +04:00
SergeyV@selena.
14e90138e5 Formatting change for #14137 patch. 2005-10-26 17:45:30 +04:00
jimw@mysql.com
a4cc61f213 Merge mysql.com:/home/jimw/my/mysql-5.0-13534 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-10-25 13:42:04 -07:00
brian@zim.(none)
da60b60207 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zim.(none):/home/brian/mysql/mysql-5.0
 2005-10-25 11:03:22 -07:00
sasha@asksasha.com
63bac8c4e4 Merge spachev@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  asksasha.com:/reiser-data/mysql-dev/mysql-5.0-bug12974
 2005-10-25 11:25:46 -06:00
hf@deer.(none)
526315ebfa Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into deer.(none):/home/hf/work/mysql-5.0.12267
 2005-10-25 22:04:20 +05:00
hf@deer.(none)
50a8dbc8c2 Merge deer.(none):/home/hf/work/mysql-5.0.13820 
into deer.(none):/home/hf/work/mysql-5.0.12267
 2005-10-25 21:10:58 +05:00
hf@deer.(none)
8cd0241439 Merge deer.(none):/home/hf/work/mysql-5.0.13667 
into deer.(none):/home/hf/work/mysql-5.0.12267
 2005-10-25 21:09:37 +05:00
hf@deer.(none)
bcebef8958 Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 
into deer.(none):/home/hf/work/mysql-5.0.12267
 2005-10-25 21:08:22 +05:00
acurtis@zim.(none)
cd19a1481e Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zim.(none):/home/acurtis/mysql-5.0-noraid.2
 2005-10-25 08:18:32 -07:00
acurtis@zim.(none)
1d860c2dbe Deprecate RAID create options 2005-10-25 08:15:37 -07:00
brian@zim.(none)
d5c90efe97 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zim.(none):/home/brian/mysql/mysql-5.0
 2005-10-25 07:29:40 -07:00
hf@deer.(none)
86e358f1c8 Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 
into deer.(none):/home/hf/work/mysql-5.0.12267
 2005-10-25 19:08:33 +05:00
ramil@mysql.com
c88f0e9c19 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/ram/work/5.0.b14207
 2005-10-25 16:06:46 +05:00
anozdrin@mysql.com
afb50a5de1 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-bug13037
 2005-10-25 13:04:46 +04:00
anozdrin@mysql.com
831de41ca6 Fix for BUG#13037: undefined variable in IF cause erroneous error-message. 2005-10-25 13:02:48 +04:00
ramil@mysql.com
70ba090d27 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/ram/work/5.0.b10303
 2005-10-25 12:19:13 +05:00
brian@zim.(none)
ab0b049f85 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zim.(none):/home/brian/mysql/mysql-5.0
 2005-10-24 23:57:15 -07:00
brian@zim.(none)
82bcb8b369 This patch add support for storing Geometry types to Archive, Innodb, NDB, and BDB. 2005-10-24 23:20:39 -07:00
timour@mysql.com
d24027fa79 Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into  mysql.com:/home/timka/mysql/src/5.0-bug-13832
 2005-10-25 09:01:47 +03:00
timour@mysql.com
f5354eba90 Fix for BUG#13832 - Unknown column t1.a in 'on clause'. 
The cause for the bug is that the priorities of all rules/terminals
that process the FROM clause are not fully specified, and the
parser generator produces a parser that doesn't always parse
the FROM clause so that JOINs are left-associative. As a result
the final join tree produced by the parser is incorrect, which
is the cause for subsequent name resolution to fail.
 2005-10-25 09:00:57 +03:00
lars@mysql.com
a9d03b67c4 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 
into  mysql.com:/users/lthalmann/bk/mysql-5.0-enum-logtype
 2005-10-25 00:23:14 +02:00
lars@mysql.com
8124629c51 Fixed enum numbering, patch 2 2005-10-24 23:09:14 +02:00
anozdrin@mysql.com
6d2934cb69 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-bug13095
 2005-10-25 00:55:31 +04:00
anozdrin@mysql.com
6105040ac4 Fix for BUG#13095: Cannot create VIEWs in prepared statements 
- allow CREATE VIEW as well as DROP VIEW to use in prepared statements;
  - fix CREATE VIEW implementation to make it work in prepared statements.
 2005-10-25 00:54:04 +04:00
sergefp@mysql.com
9a101971cf BUG#11704: Make InnoDB not to convert TL_WRITE_ONLY locks to TL_WRITE_ALLOW_WRITE in 
OPTIMIZE TABLE.
 2005-10-25 00:27:15 +04:00
lars@mysql.com
4ce4068442 Reducing risk for incorrect merges. Since we are multiple teams working on 
different features, adding numbering to enums reduce the risk that code will
be merged incorrectly.  This particular enum must have fixed values to ensure
that an upgraded server always can read old logs.  I added this, since I 
noticed the incorrect order in the RBR clone.
 2005-10-24 19:06:32 +02:00
SergeyV@selena.
ba919bd168 Fixes bug #14137. Converts charsets_dir path to underlying 
system representation.
 2005-10-24 20:08:56 +04:00
lars@mysql.com
fbcf26777e Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 
into  mysql.com:/users/lthalmann/bk/mysql-5.0-hexdump
 2005-10-24 17:23:45 +02:00
msvensson@neptunus.mysql.com
bb15425235 Fix for dropping a table with frm file consisting of "junk" 2005-10-24 15:05:06 +02:00
ramil@mysql.com
02c0fe62d8 a fix (bug #14207: strange change of values CHARACTER_OCTET_LENGTH and CHARACTER_MAXIMUM_LENGTH). 2005-10-24 16:45:27 +05:00
ramil@mysql.com
de26178f75 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/ram/work/5.0.b10303
 2005-10-24 11:36:29 +05:00
sasha@asksasha.com
f6f22df951 fix for BUG#12974: mysqld segfaults when depreciated option --sql-bin-update-same is used 2005-10-22 18:17:11 -06:00
jimw@mysql.com
2d018862fa Merge mysql.com:/home/jimw/my/mysql-4.1-11203 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-10-21 17:57:51 -07:00
serg@serg.mylan
721873f7cd compilation failure fixed 2005-10-21 14:56:59 +02:00
pem@mysql.com
1d5aeb51da Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/bug13941/mysql-5.0
 2005-10-21 13:24:41 +02:00
bar@mysql.com
fc771accbf Merge abarkov@bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0.b12371
 2005-10-21 16:24:40 +05:00
pem@mysql.com
c865f491ef Post-review fix. 2005-10-21 13:08:00 +02:00
gluh@mysql.com
f921ca2830 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/gluh/MySQL/Bugs/5.0.14089
 2005-10-21 14:42:00 +05:00
bar@mysql.com
a167ddc6e7 Bug#13233 
select distinct char(column) fails with utf8
ctype_utf8.result, ctype_utf8.test:
  Adding test case
sql_yacc.yy:
  Adding new syntax.
item_strfunc.h:
  Fixing wrong max_length calculation.
  Also, adding CHAR(x USING charset),
  for easier migrating from 4.1 to 5.0,
  according to Monty's suggestion.
 2005-10-21 14:41:56 +05:00
gluh@eagle.intranet.mysql.r18.ru
e8d52711ad fix for bug#14089 FROM list subquery always fails when 
information_schema is current database
  skip the check of I_S tables if table is derived table
 2005-10-21 13:14:54 +05:00
bar@mysql.com
612c0560a4 Merge abarkov@bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0.b12371
 2005-10-21 11:55:46 +05:00
andrey@lmy004.
991b6f1440 fix for bug #12595 (ESCAPE must be exactly 1 character long) 
ESCAPE has length of 1 if specified and sql_mode is NO_BACKSLASH_ESCAPES
or has length of 0 or 1 in every other situation.
(approved patch applied on a up-to-date tree re-commit)
 2005-10-21 04:01:52 +03:00
bar@mysql.com
7671bc00c4 Bug#12371: executing prepared statement fails (illegal mix of collations) 
ctype_utf8.test, ctype_utf8.result:
  Adding test case.
item.h:
item.cc:
  Adding Item_param::safe_charset_converter
 2005-10-20 11:56:27 +05:00
jimw@mysql.com
2c90e2f7a6 Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-10-19 13:47:05 -07:00
elliot@mysql.com
9b62dd1545 Merge mysql.com:/home/emurphy/src/bk-innodb/mysql-5.0 
into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.0
 2005-10-19 14:40:05 -04:00