Commit graph

6399 commits

Author SHA1 Message Date
unknown
1fec53cc4c cp1256.xml:
new file
2003-01-05 15:22:21 +04:00
unknown
7a0c78d4e6 latin7.xml:
new file
2003-01-05 15:19:58 +04:00
unknown
db49a63719 latin5.xml:
new file
2003-01-05 15:13:50 +04:00
unknown
6715fc38f3 cp1251.xml:
win1251ukr has been added


sql/share/charsets/cp1251.xml:
  win1251ukr has been added
2003-01-05 15:11:00 +04:00
unknown
9bec592a02 cp1251.xml:
new file
2003-01-05 15:07:45 +04:00
unknown
a46857d36d cp1257.xml:
new file
2003-01-05 15:02:50 +04:00
unknown
5b5fe119b6 latin2.xml:
new file
2003-01-05 14:52:48 +04:00
unknown
a7f79b1807 latin1.xml:
charset name was empty


sql/share/charsets/latin1.xml:
  charset name was empty
2003-01-05 14:48:18 +04:00
unknown
6a2e341d00 latin1.xml:
new file
2003-01-05 14:47:15 +04:00
unknown
9abb2bdef2 MacRoman.xml:
charset name was wrong


sql/share/charsets/MacRoman.xml:
  charset name was wrong
2003-01-05 14:36:51 +04:00
unknown
492f519035 MacRoman.xml, MacCE.xml:
new file
2003-01-05 14:34:06 +04:00
unknown
cbd4de0ab8 Merge abelkin@work.mysql.com:/home/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/mysql-4.1
2003-01-04 17:52:19 +02:00
unknown
e6a76efa29 Fix bug with shared memory's variables
sql/mysql_priv.h:
  Fix bugs with shared memory's variables
sql/mysqld.cc:
  Fix bugs with shared memory's variables
2003-01-04 20:33:17 +05:00
unknown
161c22cbfb fixed SET with subselect
mysql-test/r/subselect.result:
  test of SET with subselect
mysql-test/t/subselect.test:
  test of SET with subselect
2003-01-04 16:33:42 +02:00
unknown
f67891c244 charset.c:
this function will be used to load both Index and a named charset, so let's add a new argument to pass file name


mysys/charset.c:
  this function will be used to load both Index and a named charset, so let's add a new argument to pass file name
2003-01-04 15:21:52 +04:00
unknown
f584778536 Index.xml:
"compiled" flag


sql/share/charsets/Index.xml:
  "compiled" flag
2003-01-04 14:50:15 +04:00
unknown
5bdee64bf0 .del-Index~a8f78510440e2fc4:
Delete: sql/share/charsets/Index


BitKeeper/deleted/.del-Index~a8f78510440e2fc4:
  Delete: sql/share/charsets/Index
2003-01-04 14:25:05 +04:00
unknown
782295137b Some changes to separate charset and collation terms 2003-01-04 14:12:20 +04:00
unknown
a533a95c28 libmysql.c:
SLL -> SSL


libmysql/libmysql.c:
  SLL -> SSL
2003-01-04 13:35:52 +04:00
unknown
ce4415340e Merge abarkov@work.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-01-04 13:33:01 +04:00
unknown
dd644ed885 .del-test_xml~6237d9729f4fe38:
Delete: mysys/test_xml


BitKeeper/deleted/.del-test_xml~6237d9729f4fe38:
  Delete: mysys/test_xml
2003-01-04 13:28:41 +04:00
unknown
22e4c484e7 Merge work.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/bk/src-4.1


sql/field.cc:
  Auto merged
2003-01-03 23:44:24 -08:00
unknown
6609f346d6 Prepared statements + binary protocol test update 2003-01-03 23:38:47 -08:00
unknown
594bfe01bf Fix date,time,timestamp,year - binary protocol 2003-01-03 23:37:16 -08:00
unknown
a644e002ce Fix warnings and error VC++ compiler
client/mysql.cc:
  Removing unreferenced variables
sql/sql_test.cc:
  Fix VC++ compiler error that doesn't permits the declaration and
  initialization of variables that can be skipped by the prior
  goto end instruction.
2003-01-04 01:19:17 -02:00
unknown
8aa2e87a78 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-do-4.1


sql/sql_parse.cc:
  Auto merged
2003-01-03 19:35:14 +02:00
unknown
2ca6d018d7 fixed do with subselects
mysql-test/r/subselect.result:
  test of DO with subselects
mysql-test/t/subselect.test:
  test of DO with subselects
2003-01-03 17:08:00 +02:00
unknown
916697f121 Merge pzaitsev@work.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/pz/mysql/mysql-4.1-root
2003-01-03 17:30:03 +03:00
unknown
3f4c4cbfdd Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
2003-01-03 15:08:40 +02:00
unknown
7df75ca76a Further fix for export class problem 2003-01-03 15:07:40 +02:00
unknown
9a4a8bd2bc Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1
2003-01-03 15:39:16 +03:00
unknown
6aee322830 Missed commit 2003-01-03 04:12:34 -08:00
unknown
ce8b1f9b79 Merge myvenu.com:/home/venu/bk/src-4.1
into myvenu.com:/home/venu/work/sql/dev-4.1


sql/field.cc:
  Auto merged
2003-01-03 03:54:18 -08:00
unknown
218e9524a6 Binary protocol changes (to monty) 2003-01-03 03:52:53 -08:00
unknown
389cec7d99 Charset index is sotred in XML now 2003-01-03 14:35:32 +04:00
unknown
ac0bb91fb1 ignore:
added test_xml


BitKeeper/etc/ignore:
  added test_xml
2003-01-03 12:40:09 +04:00
unknown
bf206df0a9 Merge abarkov@work.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1.wrk
2003-01-03 12:30:30 +04:00
unknown
d5ddb99772 User data 2003-01-03 12:30:01 +04:00
unknown
6d4d487326 Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1
2003-01-02 18:54:22 +03:00
unknown
e79e53dcb3 SCRUM password() function changes.
sql/item_strfunc.cc:
  Fix password() function according Monty's comment
2003-01-02 18:04:02 +03:00
unknown
3d698ba93f Merge mysql.com:/home/wax/mysql-4n into mysql.com:/home/wax/mysql-4rw 2003-01-02 19:18:18 +05:00
unknown
c7901f2f1e Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1
2003-01-02 16:18:38 +03:00
unknown
3fe840ee07 post-post-review fix (SCRUM)
sql/item.cc:
  post-post-review fix
sql/item_cmpfunc.h:
  post-post-review fix
sql/item_row.cc:
  post-post-review fix
sql/item_subselect.cc:
  post-post-review fix
2003-01-02 12:24:33 +02:00
unknown
4e34255e5a Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1


sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-01-01 20:11:18 +03:00
unknown
be551fd943 Fix for QUOTE() function. 2003-01-01 15:59:35 +04:00
unknown
cd248a8d63 postreviews fix (SCRUM related)
reordered Item_row class variables to be sorted by memory size


mysql-test/r/subselect.result:
  fix result of subselect test
sql/item.cc:
  postreviews fix
sql/item.h:
  postreviews fix
sql/item_cmpfunc.h:
  postreviews fix
sql/item_row.cc:
  postreviews fix
sql/item_row.h:
  reordered class variables to be sorted by memory size
  postreviews fix
sql/item_strfunc.cc:
  postreviews fix
sql/item_subselect.cc:
  postreviews fix
2002-12-31 18:39:16 +02:00
unknown
d78d76f114 A fix for a charset bug in the select_export (select into
outfile) class.
2002-12-31 18:01:53 +02:00
unknown
178bce1447 Fixed duplicate of handle_count in __NT__ section
sql/mysqld.cc:
  Fixed duplicate of handle_count
2002-12-31 17:01:53 +05:00
unknown
666e150920 Change locks in sql_udf.cc to rw_locks (SCRUM)
sql/sql_udf.cc:
  Change locks to rw_locks
2002-12-31 16:58:41 +05:00
unknown
53894481bf merging
mysql-test/r/subselect.result:
  Auto merged
sql/item.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
2002-12-31 12:55:03 +02:00