Commit graph

499 commits

Author SHA1 Message Date
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
monty@mashka.mysql.fi
6be1b941bc merge 2003-01-06 02:46:36 +02:00
bar@bar.mysql.r18.ru
2c374be471 Index.xml:
fixes
2003-01-05 18:18:45 +04:00
bar@bar.mysql.r18.ru
5a82fcc5e4 Index.xml:
typo fix
2003-01-05 17:57:23 +04:00
bar@bar.mysql.r18.ru
479d82689b latin5.xml, cp1251.xml:
Comments
Index.xml:
  Languages for cp1256 have been added
.del-win1251ukr.conf~dc3540b3635ed226:
  Delete: sql/share/charsets/win1251ukr.conf
.del-win1251.conf~b6bb6681f02917b6:
  Delete: sql/share/charsets/win1251.conf
.del-win1250.conf~ea4cecf79a9a2b57:
  Delete: sql/share/charsets/win1250.conf
.del-usa7.conf~7907e7e49aad1374:
  Delete: sql/share/charsets/usa7.conf
.del-swe7.conf~adc4138b9b597e76:
  Delete: sql/share/charsets/swe7.conf
.del-pclatin2.conf~2e905fa7381fd785:
  Delete: sql/share/charsets/pclatin2.conf
.del-macromancsas.conf~cb7d2383e8e4105d:
  Delete: sql/share/charsets/macromancsas.conf
.del-macromancias.conf~c3061c0b22a0a3cb:
  Delete: sql/share/charsets/macromancias.conf
.del-macromanciai.conf~ea8974f393a79edd:
  Delete: sql/share/charsets/macromanciai.conf
.del-macromanbin.conf~b9dcdb2797fbae67:
  Delete: sql/share/charsets/macromanbin.conf
.del-macroman.conf~ee6a39463223b952:
  Delete: sql/share/charsets/macroman.conf
.del-maccecsas.conf~5f1b2bfecf71fa0:
  Delete: sql/share/charsets/maccecsas.conf
.del-maccecias.conf~8a71c3a534e70fdd:
  Delete: sql/share/charsets/maccecias.conf
.del-macceciai.conf~a4b13482b0d7a5c5:
  Delete: sql/share/charsets/macceciai.conf
.del-maccebin.conf~b2b9eab235e1a1ae:
  Delete: sql/share/charsets/maccebin.conf
.del-macce.conf~aa8efe8ce8393c31:
  Delete: sql/share/charsets/macce.conf
.del-latvian1.conf~6c7c5b2a4c896567:
  Delete: sql/share/charsets/latvian1.conf
.del-latvian.conf~a7f7110785a5ff4d:
  Delete: sql/share/charsets/latvian.conf
.del-latin5.conf~be23bc5cf8489338:
  Delete: sql/share/charsets/latin5.conf
.del-latin2.conf~c45310f353a74d9:
  Delete: sql/share/charsets/latin2.conf
.del-latin1csas.conf~e8c5219976bde66b:
  Delete: sql/share/charsets/latin1csas.conf
.del-latin1cias.conf~85465c4ba30e76d8:
  Delete: sql/share/charsets/latin1cias.conf
.del-latin1bin.conf~76f38a539b7dfa9f:
  Delete: sql/share/charsets/latin1bin.conf
.del-latin1.conf~b3d65fc96f2ce181:
  Delete: sql/share/charsets/latin1.conf
.del-koi8_ukr.conf~ce11d6ff8ffc4434:
  Delete: sql/share/charsets/koi8_ukr.conf
.del-koi8_ru.conf~334df7402af862c8:
  Delete: sql/share/charsets/koi8_ru.conf
.del-keybcs2.conf~db3e18f91b2075be:
  Delete: sql/share/charsets/keybcs2.conf
.del-hungarian.conf~3b343f4ff7919cd:
  Delete: sql/share/charsets/hungarian.conf
.del-hp8.conf~4620f2afc37ae747:
  Delete: sql/share/charsets/hp8.conf
.del-hebrew.conf~94ba65846b69f5b7:
  Delete: sql/share/charsets/hebrew.conf
.del-greek.conf~68f2c5692866226d:
  Delete: sql/share/charsets/greek.conf
.del-german1.conf~765a04d69683cefe:
  Delete: sql/share/charsets/german1.conf
.del-estonia.conf~e78f662de664f3ac:
  Delete: sql/share/charsets/estonia.conf
.del-dos.conf~5a4357d3335ba812:
  Delete: sql/share/charsets/dos.conf
.del-dec8.conf~d882c1e5e4566b87:
  Delete: sql/share/charsets/dec8.conf
.del-croat.conf~fb40a3e77604268e:
  Delete: sql/share/charsets/croat.conf
.del-danish.conf~90ffe76b3fa5dd46:
  Delete: sql/share/charsets/danish.conf
.del-cp866.conf~a70093f2be0a509:
  Delete: sql/share/charsets/cp866.conf
.del-cp1257ltlvcsas.conf~2e55f43377962ede:
  Delete: sql/share/charsets/cp1257ltlvcsas.conf
.del-cp1257ltlvcias.conf~883d366fc6aa24a1:
  Delete: sql/share/charsets/cp1257ltlvcias.conf
.del-cp1257ltlvciai.conf~f47460f62dace37e:
  Delete: sql/share/charsets/cp1257ltlvciai.conf
.del-cp1257bin.conf~a34eda136d4d93b0:
  Delete: sql/share/charsets/cp1257bin.conf
.del-cp1257.conf~a47298b64ba2dfc1:
  Delete: sql/share/charsets/cp1257.conf
.del-cp1256.conf~92e4a7b31184387b:
  Delete: sql/share/charsets/cp1256.conf
.del-cp1251csas.conf~9c4b69407a10a136:
  Delete: sql/share/charsets/cp1251csas.conf
.del-cp1251cias.conf~6e9b6b7ebafd497c:
  Delete: sql/share/charsets/cp1251cias.conf
.del-cp1251bin.conf~a7bf1f052611ca00:
  Delete: sql/share/charsets/cp1251bin.conf
.del-cp1251.conf~dfafe742142570:
  Delete: sql/share/charsets/cp1251.conf
.del-armscii8.conf~e612e5fb63e34cd4:
  Delete: sql/share/charsets/armscii8.conf
2003-01-05 17:48:10 +04:00
bar@bar.mysql.r18.ru
4e405fa200 koi8_ru -> koi8_r
charset.conf -> charset.xml
bug fix
2003-01-05 17:34:24 +04:00
bar@bar.mysql.r18.ru
12a05a357a koi8_u.xml, koi8_r.xml:
new file
Index.xml:
  these names look more standard
2003-01-05 16:14:56 +04:00
bar@bar.mysql.r18.ru
2bb86d4d61 keybcs2.xml, hp8.xml:
new file
2003-01-05 16:02:32 +04:00
bar@bar.mysql.r18.ru
24f527a1c6 hebrew.xml, greek.xml:
new file
2003-01-05 15:56:37 +04:00
bar@bar.mysql.r18.ru
db81a046e7 dec8.xml, armscii8.xml, cp866.xml:
new file
2003-01-05 15:50:41 +04:00
bar@bar.mysql.r18.ru
89c6a4c120 swe7.xml, ascii.xml:
new file
Index.xml:
  usa7 -> ascii
2003-01-05 15:38:43 +04:00
bar@bar.mysql.r18.ru
1226da2f1c cp1250.xml:
new file
Index.xml:
  win1250 -> cp1250
2003-01-05 15:34:29 +04:00
bar@bar.mysql.r18.ru
420d411737 pclatin2.xml, pclatin1.xml:
new file
Index.xml:
  pclatin1
2003-01-05 15:27:57 +04:00
bar@bar.mysql.r18.ru
e7f25e0764 cp1256.xml:
new file
2003-01-05 15:22:21 +04:00
bar@bar.mysql.r18.ru
eab4d99da6 latin7.xml:
new file
2003-01-05 15:19:58 +04:00
bar@bar.mysql.r18.ru
cb71df622d latin5.xml:
new file
2003-01-05 15:13:50 +04:00
bar@bar.mysql.r18.ru
244322df6a cp1251.xml:
win1251ukr has been added
2003-01-05 15:11:00 +04:00
bar@bar.mysql.r18.ru
7dc9e2bc66 cp1251.xml:
new file
2003-01-05 15:07:45 +04:00
bar@bar.mysql.r18.ru
ec9a59552b cp1257.xml:
new file
2003-01-05 15:02:50 +04:00
bar@bar.mysql.r18.ru
3aa244ea8c latin2.xml:
new file
2003-01-05 14:52:48 +04:00
bar@bar.mysql.r18.ru
864b50fe5d latin1.xml:
charset name was empty
2003-01-05 14:48:18 +04:00
bar@bar.mysql.r18.ru
3eccea5c27 latin1.xml:
new file
2003-01-05 14:47:15 +04:00