Commit graph

6804 commits

Author SHA1 Message Date
unknown
a10b6c3a06 Many files:
PRIMARY flag for built-in charsets


strings/ctype-big5.c:
  PRIMARY flag for built-in charsets
strings/ctype-bin.c:
  PRIMARY flag for built-in charsets
strings/ctype-euc_kr.c:
  PRIMARY flag for built-in charsets
strings/ctype-gb2312.c:
  PRIMARY flag for built-in charsets
strings/ctype-gbk.c:
  PRIMARY flag for built-in charsets
strings/ctype-sjis.c:
  PRIMARY flag for built-in charsets
strings/ctype-tis620.c:
  PRIMARY flag for built-in charsets
strings/ctype-ujis.c:
  PRIMARY flag for built-in charsets
strings/ctype-utf8.c:
  PRIMARY flag for built-in charsets
strings/ctype.c:
  PRIMARY flag for built-in charsets
2003-01-05 16:44:39 +04:00
unknown
d16824d8a7 koi8_u.xml, koi8_r.xml:
new file
Index.xml:
  these names look more standard


sql/share/charsets/Index.xml:
  these names look more standard
2003-01-05 16:14:56 +04:00
unknown
306569afc2 keybcs2.xml, hp8.xml:
new file
2003-01-05 16:02:32 +04:00
unknown
7525873a61 hebrew.xml, greek.xml:
new file
2003-01-05 15:56:37 +04:00
unknown
a50f05749d dec8.xml, armscii8.xml, cp866.xml:
new file
2003-01-05 15:50:41 +04:00
unknown
c50e104689 small bugfix
sql/item.h:
  silly mistake
2003-01-05 15:40:14 +04:00
unknown
c862dad75c swe7.xml, ascii.xml:
new file
Index.xml:
  usa7 -> ascii


sql/share/charsets/Index.xml:
  usa7 -> ascii
2003-01-05 15:38:43 +04:00
unknown
1e4525cf4b cp1250.xml:
new file
Index.xml:
  win1250 -> cp1250


sql/share/charsets/Index.xml:
  win1250 -> cp1250
2003-01-05 15:34:29 +04:00
unknown
9c2e873c0b cp1250 2003-01-05 15:31:26 +04:00
unknown
94873871e2 ctype-win1250ch.c:
cp1250_czech
  ,


strings/ctype-win1250ch.c:
  cp1250_czech
  ,
2003-01-05 15:30:02 +04:00
unknown
cd84555304 pclatin2.xml, pclatin1.xml:
new file
Index.xml:
  pclatin1


sql/share/charsets/Index.xml:
  pclatin1
2003-01-05 15:27:57 +04:00
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
d33e652321 Conflicts resolving
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/item.h:
  Conflict resolving
2003-01-05 14:12:03 +04:00
unknown
7ef0dad72e SCRUM
DEFAULT in UPDATE and SELECT


sql/field.h:
  set_default() implementation changed
sql/item.cc:
  Item_default_value methods implementations added
sql/item.h:
  Item_default_value class added
sql/sql_yacc.yy:
  DEFAULT in UPDATE and SELECT added
sql/table.cc:
  table->default_values initialization added
sql/table.h:
  st_table::default_values added
2003-01-05 14:07:24 +04:00
unknown
79fba6da8f Changed shared lib version to 12 as some structures has changed 2003-01-04 18:19:48 +02: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
8ce6c9fc6c merge
BitKeeper/etc/logging_ok:
  auto-union
include/mysql.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/r/multi_update.result:
  Auto merged
mysql-test/t/multi_update.test:
  Auto merged
mysys/Makefile.am:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/italian/errmsg.txt:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-01-04 15:40:55 +02:00
unknown
e229fe9801 Added support for DROP TEMPORARY TABLE
Removed mysql_warnings() API function.
Post merge fixes.


client/mysqltest.c:
  Don't use mysql_warnings().
include/mysql.h:
  Removed mysql_warnings() API function
libmysql/libmysql.c:
  Removed mysql_warnings() API function
mysql-test/r/rpl_log_pos.result:
  Updated results
mysql-test/t/connect.test:
  Removed empty lines
mysql-test/t/rpl_log_pos.test:
  Update to new syntax
sql/item.h:
  Fix after merge
sql/item_create.cc:
  Fix after merge
sql/mysql_priv.h:
  Added support for DROP TEMPORARY TABLE
sql/sql_db.cc:
  Added support for DROP TEMPORARY TABLE
sql/sql_parse.cc:
  SHOW WARNINGS now shows notes, warnings and errors.
  Support for DROP TEMPORARY TABLE
  Post merge fixes
sql/sql_repl.cc:
  Post merge fixes
sql/sql_table.cc:
  Added support for DROP TEMPORARY TABLE
2003-01-04 15:37:20 +02:00
unknown
1a80c06b3e Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2003-01-04 15:18:18 +02:00
unknown
2d89861033 Added support for max_allowed_packet in option files read by mysql_option()
Extended max_allowed_packet for clients to 1G
Fixed bug in sending compressed rows >= 16M
Fix bug in skiping too long packets from clients.
Added checking of wrong command number sent by client.


include/mysql.h:
  Added max_allowed_packet as option parameter.
include/mysql_com.h:
  Added COM_END to be able to check for wrong commands.
libmysql/libmysql.c:
  Extended max_allowed_packet for clients to 1G
  Added support for max_allowed_packet in option files read by mysql_option()
mysys/my_compress.c:
  Debugging output
sql/net_pkg.cc:
  Fixed wrong handling of blobs >= 16M
sql/net_serv.cc:
  Changed MAX_THREE_BYTES -> MAX_PACKET_LENGTH
  More DEBUG output and more comments
  Fixed bug in sending compressed rows >= 16M
  Optimized sending of big packets (fewer memcpy and compress data in bigger blocks)
  Fix bug in skiping too long packets from clients.
  (old code didn't always work for big packets)
sql/sql_class.h:
  Changed type of variable
sql/sql_parse.cc:
  Added checking of wrong command number sent by client.
  Changed handling of too big packets to make code safer
tests/big_record.pl:
  E
2003-01-04 15:17:16 +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
24b256987e Optimization of key usage (ORDER BY) (SCRUM) 2003-01-04 14:59: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
d3d6432f49 Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.0
into mysql.r18.ru:/usr/home/ram/work/mysql-4.0
2003-01-03 19:47:58 +04:00
unknown
287906e972 Fix for the QUOTE() function.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-01-03 19:46:15 +04: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