Commits · 7ca35c2f66f57e0a4bf6e86fd0ce05a091c9d1dc · Kirill Smelkov / mariadb

07 May, 2005 1 commit
- Small fix for the test · 7ca35c2f
  holyfoot@hf-ibm.(none) authored May 07, 2005
  
  7ca35c2f
06 May, 2005 39 commits
- Merge mysql.com:/home/hf/work/mysql-5.0.clean · fb372588
  holyfoot@mysql.com authored May 07, 2005
```
into mysql.com:/home/hf/work/mysql-5.0.10004
```
  fb372588
- Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · e95d77c6
  ramil@mysql.com authored May 07, 2005
```
into mysql.com:/home/ram/work/mysql-5.0
```
  e95d77c6
- Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 · a36ac81b
  gluh@mysql.com authored May 06, 2005
```
into mysql.com:/home/gluh/MySQL/Bugs/5.0.8998
```
  a36ac81b
- Fix for bug#8998: information_schema: Table SCHEMATA should report default collations · f285b4fc
  gluh@mysql.com authored May 06, 2005
```
   DEFAULT_COLLTION_NAME field is added to SCHEMATA table
```
  f285b4fc
- merging · 3474ae5a
  holyfoot@mysql.com authored May 06, 2005
  
  3474ae5a
- Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 0316492d
  ramil@mysql.com authored May 06, 2005
```
into mysql.com:/home/ram/work/mysql-5.0
```
  0316492d
- Merge mysql.com:/home/ram/work/mysql-4.1 · def8eb63
  ramil@mysql.com authored May 06, 2005
```
into mysql.com:/home/ram/work/mysql-5.0
```
  def8eb63
- Bug#6611: wrong sorting order. · 6a476984
  bar@noter.(none) authored May 06, 2005
```
Adding cp1250_croatian_ci collation.
```
  6a476984
- Fix for bug #10004 (Decimal operation crashes server) · ad863d40
  holyfoot@hf-ibm.(none) authored May 06, 2005
  
  ad863d40
- Fixed bugs 9820, 9799 and 9800. · 56a98396
  jani@ibmlab.site authored May 06, 2005
  
  56a98396
- Trimmed fix for bug #9546 (Crashing with huge decimals) · 5aa0edf3
  holyfoot@hf-ibm.(none) authored May 06, 2005
  
  5aa0edf3
- Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · db3abccf
  ramil@mysql.com authored May 06, 2005
```
into mysql.com:/home/ram/work/4.1
```
  db3abccf
- Bug#6505 Wrong sorting order: · b20cac25
  bar@noter.(none) authored May 06, 2005
```
latin2_croatian_ci collation was fixed.
```
  b20cac25
- Merge bk-internal.mysql.com:/data0/bk/mysql-4.1 · 534dd736
  rburnett@bk-internal.mysql.com authored May 06, 2005
```
into bk-internal.mysql.com:/users/rburnett/bug10245
```
  534dd736
- Merge bk-internal.mysql.com:/users/rburnett/bug10245 · 82f4a0b0
  rburnett@bk-internal.mysql.com authored May 06, 2005
```
into bk-internal.mysql.com:/users/rburnett/mysql-5.0
```
  82f4a0b0
- Merge bk-internal.mysql.com:/users/rburnett/bug9721 · ad6de2c0
  rburnett@bk-internal.mysql.com authored May 06, 2005
```
into bk-internal.mysql.com:/users/rburnett/mysql-5.0
```
  ad6de2c0
- Merge bk-internal.mysql.com:/data0/bk/mysql-4.1 · c95e33fa
  rburnett@bk-internal.mysql.com authored May 06, 2005
```
into bk-internal.mysql.com:/users/rburnett/bug9721
```
  c95e33fa
- Bug #9721 net_write_timeout not used on Windows · e4523c23
  rburnett@bk-internal.mysql.com authored May 06, 2005
```
viosocket.c:
  Use ?: syntax to simplify code for setting both timeouts
```
  e4523c23
- A fix (bug #7970: CONFIG_NR_CPUS not defined for kernel header percpu.h). · e1b6b7fe
  ramil@ram-book.(none) authored May 06, 2005
  
  e1b6b7fe
- Merge ibmlab.site:/home/my/bk/mysql-4.1 · 0e91a713
  jani@ibmlab.site authored May 06, 2005
```
into ibmlab.site:/home/my/bk/mysql-5.0
```
  0e91a713
- Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 · ec60f799
  jan@hundin.mysql.fi authored May 06, 2005
```
into hundin.mysql.fi:/home/jan/mysql-5.0
```
  ec60f799
- Merge hundin.mysql.fi:/home/jan/mysql-4.1 · 8cf0957d
  jan@hundin.mysql.fi authored May 06, 2005
```
into hundin.mysql.fi:/home/jan/mysql-5.0
```
  8cf0957d
- Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · a37c95d4
  stewart@mysql.com authored May 06, 2005
```
into mysql.com:/home/stewart/Documents/MySQL/4.1/ndb
```
  a37c95d4
- Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1 · 27ee6050
  jani@ibmlab.site authored May 06, 2005
```
into ibmlab.site:/home/my/bk/mysql-4.1
```
  27ee6050
- bug#6504 Upper/Lower conversion bug: · 59129d9b
  bar@noter.(none) authored May 06, 2005
```
upper/lower conversion for LATIN LETTER D WITH STROKE
was wrong in latin2.
```
  59129d9b
- Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0 · 403b0048
  marko@hundin.mysql.fi authored May 06, 2005
```
into hundin.mysql.fi:/home/marko/mysql-5.0.4
```
  403b0048
- After merge fix · ec0052cd
  marko@hundin.mysql.fi authored May 06, 2005
  
  ec0052cd
- A fix for Bug#8467. · fa25b9b4
  jani@ibmlab.site authored May 06, 2005
  
  fa25b9b4
- Merge · 2f0424cd
  marko@hundin.mysql.fi authored May 06, 2005
  
  2f0424cd
- Bug#10193 · a17bf3f4
  stewart@mysql.com authored May 06, 2005
```
Invalid DataDir in config causes ndbd segfault
```
  a17bf3f4
- A fix (bug #10404: select 0/0 returns 0). · 50579df6
  ramil@ram-book.(none) authored May 06, 2005
  
  50579df6
- Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 5496b7ba
  bar@mysql.com authored May 06, 2005
```
into mysql.com:/root/mysql-5.0
```
  5496b7ba
- Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 · b1431c22
  bar@mysql.com authored May 06, 2005
```
into mysql.com:/root/mysql-5.0
```
  b1431c22
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 917cb3df
  dlenev@mysql.com authored May 06, 2005
```
into mysql.com:/home/dlenev/src/mysql-5.0-bg9841
```
  917cb3df
- Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1 · f9e7e2ee
  marko@hundin.mysql.fi authored May 06, 2005
```
into hundin.mysql.fi:/home/marko/mysql-4.1
```
  f9e7e2ee
- merging cp932 from 4.1 · 1f14cfcb
  bar@mysql.com authored May 06, 2005
  
  1f14cfcb
- Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 788678d3
  ramil@mysql.com authored May 06, 2005
```
into mysql.com:/home/ram/work/5.0
```
  788678d3
- Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 · b93385de
  bar@mysql.com authored May 06, 2005
```
into mysql.com:/root/mysql-5.0
```
  b93385de
- Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 802360fb
  ramil@mysql.com authored May 06, 2005
```
into mysql.com:/home/ram/work/5.0
```
  802360fb