Commit graph

470 commits

Author SHA1 Message Date
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
Sinisa@sinisa.nasamreza.org
471800ff48 Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
2003-02-25 16:09:47 +02:00
monty@mashka.mysql.fi
9812831194 Fixed "syntax" errors in text message files.
Ensured that all errors messages ends with: ",
2003-02-25 13:41:08 +02:00
pem@mysql.com
d8c75ec8aa Most of the groundwork for sprint task 729 (implement FUNCTIONs).
Expanded the mysql.proc table, reworked the find/create/drop functions
completely, added new functions for FUNCTIONs (lotta functions here :),
got rid of some unnecessary use of Item_strings while at it. Extended
the parser correspondingly, and fiddled around a bit to make SP FUNCTIONs
coexist with UDFs.
Can now CREATE and DROP FUNCTIONs. Invoking yet to come...
2003-02-21 17:37:05 +01:00
lenz@mysql.com
2b1f8fbe67 Reverted Sinisa's patch "Fixing the error messages returned on GRANT
commands" again, since this problem had been fixed differently
already (Thanks to Serg for spotting this)
2003-02-19 16:16:27 +01:00
lenz@mysql.com
64b2048914 - Applying Sinisa's Patch "Fixing the error messages returned on
GRANT commands"
2003-02-19 14:50:40 +01:00
pem@mysql.com
97dc6a528e Merging 4.1 into 5.0 2003-02-18 15:05:35 +01:00
Sinisa@sinisa.nasamreza.org
5376889e28 Fixed YES/NO in Polish messages 2003-02-12 20:42:46 +02:00
monty@mashka.mysql.fi
023d6dd39b Merge with 4.0.11 2003-02-04 21:52:14 +02:00
bar@bar.mysql.r18.ru
6f25c7d9a9 cp1256.xml:
Fix
2003-01-30 10:04:02 +04:00
monty@mashka.mysql.fi
689578a099 Fixes for Netware
Call pthread_mutex_destroy() on not used mutex.
Changed comments in .h and .c files from // -> /* */
Added detection of mutex on which one didn't call pthread_mutex_destroy()
Fixed bug in create_tmp_field() which causes a memory overrun in queries that uses "ORDER BY constant_expression"
Added optimisation for ORDER BY NULL
2003-01-28 08:38:28 +02:00
pem@mysql.com
a1d21d892e Added check for selects without into in SPs, and updated error messages and tests
accordingly.
2003-01-23 14:00:32 +01:00
pem@mysql.com
0f9e2c36c3 Fixed some error handling in the SP parts of the parser. 2003-01-15 18:06:07 +01:00
pem@mysql.com
b863798a7c Fixed some basic error handling for SP functions in mysql_execute_command(). 2003-01-15 15:39:36 +01:00
bar@bar.mysql.r18.ru
af76ac08fd .del-koi8_u.xml~ec104975f7e009bf:
Delete: sql/share/charsets/koi8_u.xml
.del-koi8_r.xml~f95ebf1fb19f94cf:
  Delete: sql/share/charsets/koi8_r.xml
2003-01-09 17:41:25 +04:00
bar@bar.mysql.r18.ru
8b2b69c8eb euc_kr, koi8_r and koi8_u have been renamed so that now
all charset names don't have "_" sign.
2003-01-09 17:39:02 +04:00
bar@bar.mysql.r18.ru
38dcf18634 koi8u.xml, koi8r.xml:
new file
2003-01-09 17:27:13 +04:00
bar@bar.mysql.r18.ru
0002525520 Merge abarkov@work.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-01-07 11:39:29 +04:00