Commits · b87bc9a7d6f6a5943513119b0bd6da58e53117d3 · nexedi / MariaDB

06 Jan, 2003 1 commit
- Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1 · b87bc9a7
  unknown authored Jan 06, 2003
```
into mysql.r18.ru:/usr/home/ram/work/mysql-4.1
```
  b87bc9a7
05 Jan, 2003 26 commits

Index.xml: · 11e4085e
unknown authored Jan 05, 2003
```
  typo fix


sql/share/charsets/Index.xml:
  typo fix
```
11e4085e

charset.c: · 380a73d9

unknown authored Jan 05, 2003

  debug code has been removed
  ,


mysys/charset.c:
  debug code has been removed
  ,

380a73d9

latin5.xml, cp1251.xml: · b183b900

unknown authored Jan 05, 2003

  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


BitKeeper/deleted/.del-armscii8.conf~e612e5fb63e34cd4:
  Delete: sql/share/charsets/armscii8.conf
BitKeeper/deleted/.del-cp1251.conf~dfafe742142570:
  Delete: sql/share/charsets/cp1251.conf
BitKeeper/deleted/.del-cp1251bin.conf~a7bf1f052611ca00:
  Delete: sql/share/charsets/cp1251bin.conf
BitKeeper/deleted/.del-cp1251cias.conf~6e9b6b7ebafd497c:
  Delete: sql/share/charsets/cp1251cias.conf
BitKeeper/deleted/.del-cp1251csas.conf~9c4b69407a10a136:
  Delete: sql/share/charsets/cp1251csas.conf
BitKeeper/deleted/.del-cp1256.conf~92e4a7b31184387b:
  Delete: sql/share/charsets/cp1256.conf
BitKeeper/deleted/.del-cp1257.conf~a47298b64ba2dfc1:
  Delete: sql/share/charsets/cp1257.conf
BitKeeper/deleted/.del-cp1257bin.conf~a34eda136d4d93b0:
  Delete: sql/share/charsets/cp1257bin.conf
BitKeeper/deleted/.del-cp1257ltlvciai.conf~f47460f62dace37e:
  Delete: sql/share/charsets/cp1257ltlvciai.conf
BitKeeper/deleted/.del-cp1257ltlvcias.conf~883d366fc6aa24a1:
  Delete: sql/share/charsets/cp1257ltlvcias.conf
BitKeeper/deleted/.del-cp1257ltlvcsas.conf~2e55f43377962ede:
  Delete: sql/share/charsets/cp1257ltlvcsas.conf
BitKeeper/deleted/.del-cp866.conf~a70093f2be0a509:
  Delete: sql/share/charsets/cp866.conf
BitKeeper/deleted/.del-danish.conf~90ffe76b3fa5dd46:
  Delete: sql/share/charsets/danish.conf
BitKeeper/deleted/.del-croat.conf~fb40a3e77604268e:
  Delete: sql/share/charsets/croat.conf
BitKeeper/deleted/.del-dec8.conf~d882c1e5e4566b87:
  Delete: sql/share/charsets/dec8.conf
BitKeeper/deleted/.del-dos.conf~5a4357d3335ba812:
  Delete: sql/share/charsets/dos.conf
BitKeeper/deleted/.del-estonia.conf~e78f662de664f3ac:
  Delete: sql/share/charsets/estonia.conf
BitKeeper/deleted/.del-german1.conf~765a04d69683cefe:
  Delete: sql/share/charsets/german1.conf
BitKeeper/deleted/.del-greek.conf~68f2c5692866226d:
  Delete: sql/share/charsets/greek.conf
BitKeeper/deleted/.del-hebrew.conf~94ba65846b69f5b7:
  Delete: sql/share/charsets/hebrew.conf
BitKeeper/deleted/.del-hp8.conf~4620f2afc37ae747:
  Delete: sql/share/charsets/hp8.conf
BitKeeper/deleted/.del-hungarian.conf~3b343f4ff7919cd:
  Delete: sql/share/charsets/hungarian.conf
BitKeeper/deleted/.del-keybcs2.conf~db3e18f91b2075be:
  Delete: sql/share/charsets/keybcs2.conf
BitKeeper/deleted/.del-koi8_ru.conf~334df7402af862c8:
  Delete: sql/share/charsets/koi8_ru.conf
BitKeeper/deleted/.del-koi8_ukr.conf~ce11d6ff8ffc4434:
  Delete: sql/share/charsets/koi8_ukr.conf
BitKeeper/deleted/.del-latin1.conf~b3d65fc96f2ce181:
  Delete: sql/share/charsets/latin1.conf
BitKeeper/deleted/.del-latin1bin.conf~76f38a539b7dfa9f:
  Delete: sql/share/charsets/latin1bin.conf
BitKeeper/deleted/.del-latin1cias.conf~85465c4ba30e76d8:
  Delete: sql/share/charsets/latin1cias.conf
BitKeeper/deleted/.del-latin1csas.conf~e8c5219976bde66b:
  Delete: sql/share/charsets/latin1csas.conf
BitKeeper/deleted/.del-latin2.conf~c45310f353a74d9:
  Delete: sql/share/charsets/latin2.conf
BitKeeper/deleted/.del-latin5.conf~be23bc5cf8489338:
  Delete: sql/share/charsets/latin5.conf
BitKeeper/deleted/.del-latvian.conf~a7f7110785a5ff4d:
  Delete: sql/share/charsets/latvian.conf
BitKeeper/deleted/.del-latvian1.conf~6c7c5b2a4c896567:
  Delete: sql/share/charsets/latvian1.conf
BitKeeper/deleted/.del-macce.conf~aa8efe8ce8393c31:
  Delete: sql/share/charsets/macce.conf
BitKeeper/deleted/.del-maccebin.conf~b2b9eab235e1a1ae:
  Delete: sql/share/charsets/maccebin.conf
BitKeeper/deleted/.del-macceciai.conf~a4b13482b0d7a5c5:
  Delete: sql/share/charsets/macceciai.conf
BitKeeper/deleted/.del-maccecias.conf~8a71c3a534e70fdd:
  Delete: sql/share/charsets/maccecias.conf
BitKeeper/deleted/.del-maccecsas.conf~5f1b2bfecf71fa0:
  Delete: sql/share/charsets/maccecsas.conf
BitKeeper/deleted/.del-macroman.conf~ee6a39463223b952:
  Delete: sql/share/charsets/macroman.conf
BitKeeper/deleted/.del-macromanbin.conf~b9dcdb2797fbae67:
  Delete: sql/share/charsets/macromanbin.conf
BitKeeper/deleted/.del-macromanciai.conf~ea8974f393a79edd:
  Delete: sql/share/charsets/macromanciai.conf
BitKeeper/deleted/.del-macromancias.conf~c3061c0b22a0a3cb:
  Delete: sql/share/charsets/macromancias.conf
BitKeeper/deleted/.del-macromancsas.conf~cb7d2383e8e4105d:
  Delete: sql/share/charsets/macromancsas.conf
BitKeeper/deleted/.del-pclatin2.conf~2e905fa7381fd785:
  Delete: sql/share/charsets/pclatin2.conf
BitKeeper/deleted/.del-swe7.conf~adc4138b9b597e76:
  Delete: sql/share/charsets/swe7.conf
BitKeeper/deleted/.del-usa7.conf~7907e7e49aad1374:
  Delete: sql/share/charsets/usa7.conf
BitKeeper/deleted/.del-win1250.conf~ea4cecf79a9a2b57:
  Delete: sql/share/charsets/win1250.conf
BitKeeper/deleted/.del-win1251.conf~b6bb6681f02917b6:
  Delete: sql/share/charsets/win1251.conf
BitKeeper/deleted/.del-win1251ukr.conf~dc3540b3635ed226:
  Delete: sql/share/charsets/win1251ukr.conf
sql/share/charsets/Index.xml:
  Languages for cp1256 have been added
sql/share/charsets/cp1251.xml:
  Comments
sql/share/charsets/latin5.xml:
  Comments

b183b900

ctype.c: · d10674a8

unknown authored Jan 05, 2003

  koi8_ru -> koi8_r
  koi8_ukr -> koi8_u
  usa7 -> ascii


strings/ctype.c:
  koi8_ru -> koi8_r
  koi8_ukr -> koi8_u
  usa7 -> ascii

d10674a8

koi8_ru -> koi8_r · cea39c69

unknown authored Jan 05, 2003

charset.conf -> charset.xml
bug fix


mysql-test/r/ctype_many.result:
  koi8_ru -> koi8_r
mysql-test/t/ctype_many.test:
  koi8_ru -> koi8_r
mysys/charset.c:
  charset.conf -> charset.xml
sql/share/Makefile.am:
  charset.conf -> charset.xml
strings/ctype-simple.c:
  Bug fix

cea39c69

Many files: · 2b7b15c0

unknown authored Jan 05, 2003

  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

2b7b15c0

koi8_u.xml, koi8_r.xml: · a983c939

unknown authored Jan 05, 2003

  new file
Index.xml:
  these names look more standard


sql/share/charsets/Index.xml:
  these names look more standard

a983c939

keybcs2.xml, hp8.xml: · 5715dcd2
unknown authored Jan 05, 2003
```
  new file
```
5715dcd2
hebrew.xml, greek.xml: · 14f5f528
unknown authored Jan 05, 2003
```
  new file
```
14f5f528
dec8.xml, armscii8.xml, cp866.xml: · 65e68ccc
unknown authored Jan 05, 2003
```
  new file
```
65e68ccc

swe7.xml, ascii.xml: · eaddfd1c

unknown authored Jan 05, 2003

  new file
Index.xml:
  usa7 -> ascii


sql/share/charsets/Index.xml:
  usa7 -> ascii

eaddfd1c

cp1250.xml: · 994023df

unknown authored Jan 05, 2003

  new file
Index.xml:
  win1250 -> cp1250


sql/share/charsets/Index.xml:
  win1250 -> cp1250

994023df

cp1250 · 7f16f917
unknown authored Jan 05, 2003

7f16f917

ctype-win1250ch.c: · c47a3c37

unknown authored Jan 05, 2003

  cp1250_czech
  ,


strings/ctype-win1250ch.c:
  cp1250_czech
  ,

c47a3c37

pclatin2.xml, pclatin1.xml: · 233b828f

unknown authored Jan 05, 2003

  new file
Index.xml:
  pclatin1


sql/share/charsets/Index.xml:
  pclatin1

233b828f

cp1256.xml: · fd1dd2ed
unknown authored Jan 05, 2003
```
  new file
```
fd1dd2ed
latin7.xml: · e89000cc
unknown authored Jan 05, 2003
```
  new file
```
e89000cc
latin5.xml: · 6332870d
unknown authored Jan 05, 2003
```
  new file
```
6332870d

cp1251.xml: · 55efb10a

unknown authored Jan 05, 2003

  win1251ukr has been added


sql/share/charsets/cp1251.xml:
  win1251ukr has been added

55efb10a

cp1251.xml: · 23b4c2db
unknown authored Jan 05, 2003
```
  new file
```
23b4c2db
cp1257.xml: · b339a0f1
unknown authored Jan 05, 2003
```
  new file
```
b339a0f1
latin2.xml: · 6e4e2f66
unknown authored Jan 05, 2003
```
  new file
```
6e4e2f66

latin1.xml: · 7f52c626

unknown authored Jan 05, 2003

  charset name was empty


sql/share/charsets/latin1.xml:
  charset name was empty

7f52c626

latin1.xml: · 3c47b6e0
unknown authored Jan 05, 2003
```
  new file
```
3c47b6e0

MacRoman.xml: · 7a0907c9

unknown authored Jan 05, 2003

  charset name was wrong


sql/share/charsets/MacRoman.xml:
  charset name was wrong

7a0907c9

MacRoman.xml, MacCE.xml: · c88970fb
unknown authored Jan 05, 2003
```
  new file
```
c88970fb

04 Jan, 2003 13 commits
- Merge abelkin@work.mysql.com:/home/bk/mysql-4.1 · de901990
  unknown authored Jan 04, 2003
```
into sanja.is.com.ua:/home/bell/mysql/mysql-4.1
```
  de901990
- Fix bug with shared memory's variables · e3939f38
  unknown authored Jan 04, 2003
```
sql/mysql_priv.h:
  Fix bugs with shared memory's variables
sql/mysqld.cc:
  Fix bugs with shared memory's variables
```
  e3939f38
- fixed SET with subselect · 8f6c98f1
  unknown authored Jan 04, 2003
```
mysql-test/r/subselect.result:
  test of SET with subselect
mysql-test/t/subselect.test:
  test of SET with subselect
```
  8f6c98f1
- charset.c: · 31f4e05b
  unknown authored Jan 04, 2003
```
  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
```
  31f4e05b
- Optimization of key usage (ORDER BY) (SCRUM) · b2a2f06a
  unknown authored Jan 04, 2003
  
  b2a2f06a
- Index.xml: · f06eed26
  unknown authored Jan 04, 2003
```
  "compiled" flag


sql/share/charsets/Index.xml:
  "compiled" flag
```
  f06eed26
- .del-Index~a8f78510440e2fc4: · 69b79c24
  unknown authored Jan 04, 2003
```
  Delete: sql/share/charsets/Index


BitKeeper/deleted/.del-Index~a8f78510440e2fc4:
  Delete: sql/share/charsets/Index
```
  69b79c24
- Some changes to separate charset and collation terms · 1930238a
  unknown authored Jan 04, 2003
  
  1930238a
- libmysql.c: · 69f0c5e0
  unknown authored Jan 04, 2003
```
  SLL -> SSL


libmysql/libmysql.c:
  SLL -> SSL
```
  69f0c5e0
- Merge abarkov@work.mysql.com:/home/bk/mysql-4.1 · 942d7e36
  unknown authored Jan 04, 2003
```
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
```
  942d7e36
- .del-test_xml~6237d9729f4fe38: · 6dddc7b2
  unknown authored Jan 04, 2003
```
  Delete: mysys/test_xml


BitKeeper/deleted/.del-test_xml~6237d9729f4fe38:
  Delete: mysys/test_xml
```
  6dddc7b2
- Merge work.mysql.com:/home/bk/mysql-4.1 · f18623ab
  unknown authored Jan 03, 2003
```
into myvenu.com:/home/venu/bk/src-4.1


sql/field.cc:
  Auto merged
```
  f18623ab
- Prepared statements + binary protocol test update · 965d9401
  unknown authored Jan 03, 2003
  
  965d9401