Commits · 4b3b4b925086071003fb9cfcd218e9d0db4c4122 · Kirill Smelkov / mariadb

03 Sep, 2003 12 commits
- merge · 4b3b4b92
  monty@narttu.mysql.fi authored Sep 03, 2003
  
  4b3b4b92
- Merge kosipov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 32635549
  kostja@oak.local authored Sep 03, 2003
```
into oak.local:/home/kostja/mysql/mysql-4.1-root
```
  32635549
- C cleanups · 2317fa3b
  serg@serg.mylan authored Sep 03, 2003
  
  2317fa3b
- Monty explanation for net_store_length(uint) put to the comment · f1a4f7d0
  kostja@oak.local authored Sep 03, 2003
  
  f1a4f7d0
- Merge bk-internal:/home/bk/mysql-4.1/ · 7d2b0a0c
  serg@serg.mylan authored Sep 03, 2003
```
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
```
  7d2b0a0c
- fixed after-merge bug in CHANG_USER command · 2335c7a0
  kostja@oak.local authored Sep 03, 2003
  
  2335c7a0
- Merge kosipov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 711a3f68
  kostja@oak.local authored Sep 03, 2003
```
into oak.local:/home/kostja/mysql/mysql-4.1-root
```
  711a3f68
- post-merge fixes · 424a6470
  kostja@oak.local authored Sep 03, 2003
  
  424a6470
- merge commit, hope that none of bar and dlenev changes were · 36dd82c1
  kostja@oak.local authored Sep 03, 2003
```
lost.
```
  36dd82c1
- merged · 755455e1
  serg@serg.mylan authored Sep 03, 2003
  
  755455e1
- CHECKSUM TABLE table1, table2, ... [ QUICK | EXTENDED ] · 2fcab1c2
  serg@serg.mylan authored Sep 03, 2003
  
  2fcab1c2
- Added automatically created SSL certificates from mysql-test/std_data · bd49884c
  dlenev@dlenev.mshome authored Sep 03, 2003
```
to ignore list.
```
  bd49884c
01 Sep, 2003 4 commits
- Updated various tests results which were missed during auto-merge · f655ba98
  dlenev@dlenev.mshome authored Sep 01, 2003
```
with replication over SSL patch.
```
  f655ba98
- Manual merge fixes · 73ab4be2
  dlenev@mysql.com authored Sep 01, 2003
  
  73ab4be2
- Implemented replication over SSL · 2486222c
  dlenev@dlenev.mshome authored Sep 01, 2003
```
 Added proper options to CHANGE MASTER TO, new fields to SHOW SLAVE STATUS,
 Honoring this parameters during connection to master.
 Introduced new format of master.info file
```
  2486222c
- Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · fe98e580
  ram@mysql.r18.ru authored Sep 01, 2003
```
into mysql.r18.ru:/usr/home/ram/work/4.1
```
  fe98e580
30 Aug, 2003 6 commits
- Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 · b92567ac
  Sinisa@sinisa.nasamreza.org authored Aug 30, 2003
```
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
```
  b92567ac
- Merge miguel@bk-internal.mysql.com:/home/bk/mysql-4.1 · ffaeee7e
  miguel@hegel.local authored Aug 30, 2003
```
into hegel.local:/home/miguel/bk/mysql-4.1
```
  ffaeee7e
- Two small fixes · b0a89319
  Sinisa@sinisa.nasamreza.org authored Aug 30, 2003
  
  b0a89319
- Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 · 8f39fb9e
  Sinisa@sinisa.nasamreza.org authored Aug 30, 2003
```
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
```
  8f39fb9e
- Fix for a compilation problem with VC++ · 5b38005c
  Sinisa@sinisa.nasamreza.org authored Aug 30, 2003
  
  5b38005c
- Fix VC++ compiler error with redifinition return type · 234208f0
  miguel@hegel.local authored Aug 29, 2003
  
  234208f0
29 Aug, 2003 7 commits
- Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 0466c250
  bell@sanja.is.com.ua authored Aug 29, 2003
```
into sanja.is.com.ua:/home/bell/mysql/bk/work-tmp_field-4.1
```
  0466c250
- tmp_table_field() renamed to get_tmp_table_field() to avoid redifinition of... · 334841d9
  bell@sanja.is.com.ua authored Aug 29, 2003
```
tmp_table_field() renamed to get_tmp_table_field() to avoid redifinition of tmp_table_field(TABLE *t_arg)
```
  334841d9
- comment left after merge was moved to correct · dc636603
  kostja@oak.local authored Aug 29, 2003
```
place
```
  dc636603
- merge with 4.0.15 · 77a70a0a
  monty@narttu.mysql.fi authored Aug 29, 2003
  
  77a70a0a
- Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 144d0efa
  gluh@gluh.mysql.r18.ru authored Aug 29, 2003
```
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.fix
```
  144d0efa
- Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · 5e04e237
  monty@narttu.mysql.fi authored Aug 29, 2003
```
into narttu.mysql.fi:/my/mysql-4.0
```
  5e04e237
- Revert change of lower-case-table handling as this breaks how alias works. · 27e331c3
  monty@narttu.mysql.fi authored Aug 29, 2003
```
Changes like this should be done to 4.1, not to a stable release
```
  27e331c3
28 Aug, 2003 11 commits
- Fixed problem with absence of gmtime_r under Windows. · 6cad8977
  dlenev@dlenev.mshome authored Aug 29, 2003
  
  6cad8977
- Merge jcole@bk-internal.mysql.com:/home/bk/mysql-4.0 · 289ffc97
  jcole@mugatu.spaceapes.com authored Aug 28, 2003
```
into mugatu.spaceapes.com:/home/jcole/bk/mysql-4.0
```
  289ffc97
- opt_range.cc: Fixes for out of memory conditions. · 7a501187
  jcole@mugatu.spaceapes.com authored Aug 28, 2003
  
  7a501187
- Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · 7d653b2c
  monty@narttu.mysql.fi authored Aug 28, 2003
```
into narttu.mysql.fi:/my/mysql-4.0
```
  7d653b2c
- Portability fixes · a2a1e972
  monty@narttu.mysql.fi authored Aug 28, 2003
  
  a2a1e972
- Removed restriction not to be able use non regular files. · fc2fe364
  jani@rhols221.adsl.netsonic.fi authored Aug 28, 2003
  
  fc2fe364
- Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 96cb167d
  bell@sanja.is.com.ua authored Aug 28, 2003
```
into sanja.is.com.ua:/home/bell/mysql/bk/work-enum-4.1
```
  96cb167d
- fixed typo · 7a56d62d
  bell@sanja.is.com.ua authored Aug 28, 2003
  
  7a56d62d
- Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1 · eccab7f8
  bell@laptop.sanja.is.com.ua authored Aug 28, 2003
```
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
```
  eccab7f8
- Fix for the bug #1125 mysqldump -X creates invalid XML · 3e9c5559
  ram@mysql.r18.ru authored Aug 28, 2003
  
  3e9c5559
- Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · d6761fad
  bell@laptop.sanja.is.com.ua authored Aug 28, 2003
```
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-aggregate-4.1
```
  d6761fad