Commit graph

387 commits

Author SHA1 Message Date
venu@myvenu.com
0c25993d24 Fix merge conflict by changing warning codes to new one 2003-05-21 01:21:06 -07:00
venu@myvenu.com
97a2c472bc Resolve merge conflict 2003-05-21 00:14:56 -07:00
bar@bar.mysql.r18.ru
5b788e660a A separate, better error message when it's impossible to aggregate strings for some operation 2003-05-20 16:36:59 +05:00
monty@narttu.mysql.fi
dd2b7918cd Merge with 4.0.13 2003-05-19 16:35:49 +03:00
monty@mashka.mysql.fi
60dfb25be3 Give warning if MySQL doesn't honor given storage engine
Allow syntax CREATE TABLE t1 (LIKE t2)
2003-05-13 11:15:11 +03:00
monty@narttu.mysql.fi
c6333c5148 Fixed bug in SET SQL_BIG_SELECTS 2003-04-24 09:18:53 +03:00
pem@mysql.com
7b5df9edec Check the number of args to SPs.
Fixes bug #280.
2003-04-17 13:20:02 +02:00
pem@mysql.com
64da2fff67 Post post-merge fix. 2003-04-17 00:34:15 +02:00
pem@mysql.com
386b0b91b2 Merged 4.1 into 5.0. 2003-04-16 23:23:23 +02:00
vva@eagle.mysql.r18.ru
02ad1b95e3 Merge 2003-04-10 10:25:21 -04:00
vva@eagle.mysql.r18.ru
950fa7aa8a added compress/uncompress function 2003-04-09 20:50:30 -04:00
hf@deer.mysql.r18.ru
5d4e9f95f2 Merging 2003-04-08 19:43:24 +05:00
bar@bar.mysql.r18.ru
11355b6795 All collation names are now fit into convension 2003-04-07 18:49:56 +05:00
pem@mysql.com
2c15b36513 Merge 2003-04-04 14:38:56 +02:00
pem@mysql.com
3ee502837a Merge pmartin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/pem/work/mysql-4.1
2003-04-04 14:24:01 +02:00
pem@mysql.com
608cba3f5a Added missing error message (was only added in english/).
Removed extraneous error message from german/errmsg.txt.
2003-04-04 14:23:24 +02:00
bar@bar.mysql.r18.ru
da50242988 Index.xml:
Type
2003-04-04 17:21:48 +05:00
pem@mysql.com
736e78251e Merging 4.1 to 5.0. 2003-04-04 13:45:35 +02:00
wax@kishkin.ru
8c0de640e3 resolve new updates group_concat 2003-04-02 19:16:19 +06:00
wax@kishkin.ru
74e32241c4 Auto merged 2003-04-02 18:15:16 +06:00
guilhem@mysql.com
654410a3d3 Deprecated the update log (Sprint task #792). Now --log-update
just turns on --log-bin and prints a warning. SQL_LOG_UPDATE
is handled in two ways (see mysqld.cc for comments).
2003-04-02 00:15:20 +02:00
bar@bar.mysql.r18.ru
8cbad53268 cp1257.xml, Index.xml:
cp1257 is Lithuanian sorting
2003-04-01 19:03:02 +05:00
bar@bar.mysql.r18.ru
83cbc2838a Some collation have been renamed to fit into convension 2003-04-01 18:54:01 +05:00
bar@bar.mysql.r18.ru
11ce18a935 Standard charset names:
pclatin1 -> cp850
pclatin2 -> cp852
2003-04-01 17:49:24 +05:00
bar@bar.mysql.r18.ru
ffa5f52e2d Better error message 2003-04-01 10:26:36 +05:00
hf@genie.(none)
0ee0589e93 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into genie.(none):/home/hf/work/mysql-5.0.kil
2003-03-31 13:42:37 +05:00
hf@genie.(none)
f8f0b70380 SCRUM
two KILL commands implementation (version 2)
2003-03-31 13:39:46 +05:00
monty@mashka.mysql.fi
ef4db1377f Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1
2003-03-27 14:17:51 +02:00
pem@mysql.com
c77699ca93 Merged 4.1 into 5.0. 2003-03-27 12:09:11 +01:00
monty@mashka.mysql.fi
3bed7a6131 Merge with 4.0.13 2003-03-26 18:37:38 +02:00
bar@bar.mysql.r18.ru
3f777ceff3 greek.xml:
Comments why "greek" is ISO greek
2003-03-26 14:11:04 +04:00
bar@bar.mysql.r18.ru
4e06f1f5bd German Phone book collation is always compiled
Some collation names have been renamed
2003-03-26 13:27:19 +04:00
bar@bar.mysql.r18.ru
0f7c02f5fa SHOW CHARACTER SET now can display comments
Low case letters are used in charset names
2003-03-25 16:12:49 +04:00
bar@bar.mysql.r18.ru
1c5dd1f533 Collation names have been renamed to common style 2003-03-25 12:07:46 +04:00
pem@mysql.com
30517cef9f Merge pmartin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/pem/work/mysql-4.1
2003-03-20 10:13:23 +01:00
pem@mysql.com
e7814e398e Fixed a few typos, and translated new messages. 2003-03-19 14:13:37 +01:00
pem@mysql.com
9bdeb7782a Fixed lots of typos, and translated a few messages. 2003-03-19 14:04:30 +01:00
pem@mysql.com
6822eb5ec0 Post-merge fixes. 2003-03-19 11:36:32 +01:00
pem@mysql.com
4a171efd6f Merged 4.1 -> 5.0. 2003-03-18 16:12:50 +01:00
wax@kishkin.ru
12f1cb55b5 This is full commit of group_concat with support subselects 2003-03-18 04:07:40 +05:00
monty@narttu.mysql.fi
a434bca704 Merge with 4.0 2003-03-16 19:17:54 +02:00
serg@serg.mysql.com
299999264e error messages translated by Egor 2003-03-07 15:22:05 +01:00
monty@mashka.mysql.fi
d56e2acf50 Merge to get fix for LOCK TABLES + DROP TABLE in another thread 2003-03-07 01:20:56 +02:00
pem@mysql.com
12f771d9e7 Improved error handling regarding SPs (with info like names etc in the output).
Disabled queries in FUNCTIONs.
2003-03-05 19:45:17 +01:00
bar@bar.mysql.r18.ru
c4dc670d61 Every character set now has binary collation 2003-03-04 11:04:19 +04:00
guilhem@mysql.com
dc634a18e9 Do not give an error when the user does START SLAVE on an already
running slave, just give a warning. Same thing for STOP SLAVE.
This will make scripts writing easier for users.
2003-03-03 23:12:17 +01:00
bar@bar.mysql.r18.ru
475e64520b New error message for situation like:
SELECT latin1_expr COLLATE anpther_charset_collation
2003-03-02 14:05:03 +04:00
ram@mysql.r18.ru
2870719c70 All segments of SPATIAL keys MUST be NOT NULL.
Allow NULL geometry fields.
2003-02-26 20:25:48 +04:00
monty@narttu.mysql.fi
9a46698e1e Merge with 4.0.11 2003-02-26 01:03:47 +02:00
monty@narttu.mysql.fi
326b8abc89 merge with 3.23 to get corrected error message files and rename of files in mysql-test 2003-02-26 00:22:35 +02:00