Commit graph

6922 commits

Author SHA1 Message Date
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
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
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
jani@ua141d10.elisa.omakaista.fi
2dd1e4f94e Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-tmp
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
2005-10-13 18:23:53 +03:00
hf@deer.(none)
27d8bc5b1f merging 2005-10-13 19:51:07 +05:00
hf@deer.(none)
62ffbea5e4 merging 2005-10-13 19:31:09 +05:00
bar@mysql.com
fa0dec7531 Merge abarkov@bk-internal:/home/bk/mysql-5.0
into  mysql.com:/usr/home/bar/mysql-5.0.char1
2005-10-13 19:27:44 +05:00
bar@mysql.com
7c81d7fc69 ctype_utf8.result, ctype_utf8.test:
New syntax: CHAR(x USING charset)
  Adding test case.
sql_yacc.yy:
  New syntax: CHAR(x USING charset)
  Adding new parser rule.
item_strfunc.h:
  New syntax: CHAR(x USING charset)
  Adding a new constructor.
2005-10-13 19:24:47 +05:00
hf@deer.(none)
c933505d2d Fix for bug #3874 (Group by field is not considered) 2005-10-13 19:23:52 +05:00
bar@mysql.com
c229567887 Merge abarkov@bk-internal:/home/bk/mysql-5.0
into  mysql.com:/usr/home/bar/mysql-5.0.b9278
2005-10-13 19:19:05 +05:00
bar@mysql.com
39b0712cf7 type_binary.result, type_binary.test:
new file
mysql_fix_privilege_tables.sql, mysql_create_system_tables.sh:
  Adding true BINARY/VARBINARY: fixing "password" type, not to be 0x00-padding.
Many files:
  Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
  Adding true BINARY/VARBINARY: new pad_char structure member.
ctype-bin.c:
  Adding true BINARY/VARBINARY: new pad_char structure member.
  New strnxfrm, with two trailing length bytes.
field.cc:
  Adding true BINARY/VARBINARY.
2005-10-13 19:16:19 +05:00
evgen@moonbone.local
818c37ac68 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into moonbone.local:/work/13535-bug-4.1-mysql
2005-10-13 17:17:32 +04:00
evgen@moonbone.local
fbd5140f2b Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into moonbone.local:/work/7672-bug-5.0-mysql
2005-10-13 17:11:18 +04:00
kent@mysql.com
d0922679e0 Merge 2005-10-13 14:35:53 +02:00
kent@mysql.com
ab22636120 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-release
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-10-13 14:23:37 +02:00
evgen@moonbone.local
4d2a58f848 Manual merge of bug fix #7672 2005-10-13 16:00:26 +04:00
bar@mysql.com
ade90d49e5 Merge abarkov@bk-internal:/home/bk/mysql-5.0
into  mysql.com:/usr/home/bar/mysql-5.0.b12547
2005-10-13 16:21:35 +05:00