1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-24 06:01:25 +03:00
Commit Graph

6938 Commits

Author SHA1 Message Date
anozdrin@mysql.com
bfc8e85b06 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:57:23 +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
patg@krsna.patg.net
89b2b92b4e Disabled federated test, added then removed
federated.disabled and instead using disabled.def (per
comments in this commit)

disabled.def:
  disabled federated until bug 14272 is fixed.
.del-federated.disabled~9e4cca59f547174d:
  Delete: mysql-test/t/federated.disabled
federated.disabled:
  New BitKeeper file ``t/federated.disabled'' to disable federated test until
  Bug 14272 is fixed.
  new file
2005-10-24 13:51:05 -07:00
pem@mysql.com
0647d280b3 Merge mysql.com:/usr/local/bk/mysql-5.0
into  mysql.com:/usr/home/pem/bug13941/mysql-5.0
2005-10-21 14:51:51 +02:00
bar@mysql.com
321d833eef Merge mysql.com:/usr/home/bar/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-5.0.b12371
2005-10-21 16:53:50 +05: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
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
kent@mysql.com
70c816c801 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-10-20 23:23:33 +02:00
msvensson@neptunus.(none)
c7174f18f9 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-10-20 10:28:52 +02: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
elliot@mysql.com
0955163bb1 BUG#14056 Column prefix index on UTF-8 primary key column causes 'Can't find record..'
Applying InnoDB patch from Jan Lindstrom
2005-10-19 12:06:29 -04:00
pem@mysql.com
ca5e435f82 Fixed BUG#13941: replace() string fuction behaves badly inside stored
procedure
  For some functions returning strings (like "replace" and "ifnull" - where
  val_str() is returning a pointer into one of the parameters) - we ended
  up with a dangling pointer after the new operator destroyed the reuse item
  in the eval function.
  A working, if not very elegant, solution is to simply copy the string in
  such cases.
2005-10-19 14:54:54 +02:00
konstantin@mysql.com
bee76b78a2 A fix and a test case for Bug#13587 "Server crash when SP is created
without database"
2005-10-19 14:46:32 +04:00
sergefp@mysql.com
867e790dc8 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-bug12915-merge
2005-10-19 12:42:50 +04:00
brian@zim.(none)
3cde418f27 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
into  zim.(none):/home/brian/mysql/mysql-5.0
2005-10-18 15:01:50 -07:00
brian@zim.(none)
6ab502e523 Per a user request there is now support for "CHECK TABLE" where the table is an archive file. 2005-10-18 14:52:38 -07:00
sergefp@mysql.com
e7065d355c BUG#121915: Merge 4.1->5.0 2005-10-19 01:52:06 +04:00
bell@sanja.is.com.ua
408f2619e5 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
2005-10-18 21:50:00 +03:00
bell@sanja.is.com.ua
f95489f91b check of ACL initialization in is_acl_user() (BUG#13504) 2005-10-18 21:42:26 +03:00
jimw@mysql.com
e284a57c88 Merge mysql.com:/home/jimw/my/mysql-4.1-13334
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-18 09:45:12 -07:00
sergefp@mysql.com
d6903c4566 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-bug12915-r2
2005-10-18 14:08:50 +04:00
gluh@eagle.intranet.mysql.r18.ru
7ccf861242 Fix for bug#13783 mysqlcheck tries to optimize and analyze information_schema
'information_schema' is excluded from list of databases for mysqlcheck command
2005-10-18 14:25:03 +05:00
petr@mysql.com
ee8e163776 fix for im_life_cycle test: replace im instance port number with a constant string.
The lack of this --replace resulted in the test failing on all build hosts
2005-10-18 00:48:34 +04:00
kent@mysql.com
cb034d23cb Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-10-17 19:05:37 +02:00
pem@mysql.com
ddc36a2784 Merge mysql.com:/usr/local/bk/mysql-5.0
into  mysql.com:/home/pem/work/bug7049/mysql-5.0
2005-10-17 15:12:38 +02:00
kent@mysql.com
9e4e6de826 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-10-17 13:58:46 +02:00
evgen@moonbone.local
35e1684206 sp-security.result, sp.result, sp-security.test, sp.test:
Test for bug#12812 moved from sp.test to sp-security.test
2005-10-16 22:47:19 +04:00
petr@mysql.com
9333902613 Merge mysqldev@production.mysql.com:my/mysql-5.0-release
into  mysql.com:/home/cps/mysql/trees/mysql-5.0
2005-10-16 19:37:21 +04:00
petr@mysql.com
1b0566c20b portability fix: sh does not support "==". This resulted in IM tests failing on range of platforms. 2005-10-16 19:30:10 +04:00
bar@mysql.com
a3eea8849c Merge mysql.com:/usr/home/bar/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-5.0
2005-10-14 14:02:21 +05:00
bar@mysql.com
3369f5bd89 Merge mysql.com:/usr/home/bar/mysql-4.1.b13145
into  mysql.com:/usr/home/bar/mysql-4.1
2005-10-14 13:57:38 +05:00
bar@mysql.com
7f734c168a Merge mysql.com:/usr/home/bar/mysql-5.0.b12547
into  mysql.com:/usr/home/bar/mysql-5.0.char1
2005-10-14 13:37:19 +05:00
bar@mysql.com
0bf436a058 Merge mysql.com:/usr/home/bar/mysql-4.1.b13751
into  mysql.com:/usr/home/bar/mysql-5.0.char1
2005-10-14 12:07:13 +05:00
bar@mysql.com
5df9c6c2a3 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b13751
2005-10-14 11:54:10 +05:00
bar@mysql.com
58343bede3 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b13751
2005-10-14 09:09:25 +05:00
bar@mysql.com
8bd1ccc642 Merge abarkov@bk-internal:/home/bk/mysql-5.0
into  mysql.com:/usr/home/bar/mysql-5.0.char1
2005-10-14 08:20:02 +05:00
patg@krsna.patg.net
e13ffdae40 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0
2005-10-13 15:41:52 -07:00
monty@mysql.com
3da5f1c223 Move handling of suffix_length from strnxfrm_bin() to filesort to ensure proper sorting of all kind of binary objects
field::sort_key() now adds length last for varbinary/blob
VARBINARY/BLOB is now sorted by filesort so that shorter strings comes before longer ones
Fixed issues in test cases from last merge
2005-10-14 00:04:52 +03:00
bell@sanja.is.com.ua
6d6e107f12 - set 'updating' in both tables list if we have two of them (because of subquery) (BUG#13236)
- fixed test
2005-10-14 00:02:38 +03:00
patg@krsna.patg.net
d86f40650f BUG# 13146
Re-application of patch to clean 5.0 tree. Fixed issue with ANSI quotes 
when dumping triggers
2005-10-13 13:42:56 -07:00
monty@mysql.com
6f5baa1eba Merge mysql.com:/home/my/mysql-4.1
into  mysql.com:/home/my/mysql-5.0
2005-10-13 20:18:37 +03:00
bar@mysql.com
fee9c13568 Merge abarkov@bk-internal:/home/bk/mysql-5.0
into  mysql.com:/usr/home/bar/mysql-5.0.b9278
2005-10-13 22:18:35 +05:00
bar@mysql.com
bf1a3bc030 select.result, mysqldump-max.result:
after merge fix.
range.result:
  fixing result accordingly
  ,
cast.result:
  after merge fix
range.test:
  Avoid SELECT'ing of BINARY column not to output 0x00 bytes.
2005-10-13 21:28:44 +05:00