Commits · db88cf3df7bc004c35fdda2e683b4e170ca20889 · nexedi / MariaDB

13 Dec, 2006 2 commits
- Merge mysql.com:/home/svoj/devel/mysql/BUG23404/mysql-4.1-engines · db88cf3d
  svoj@mysql.com/april.(none) authored Dec 13, 2006
```
into  mysql.com:/home/svoj/devel/mysql/BUG23404/mysql-5.0-engines
```
  db88cf3d
- Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-engines · f92ae8d6
  svoj@mysql.com/april.(none) authored Dec 13, 2006
```
into  mysql.com:/home/svoj/devel/mysql/BUG23404/mysql-4.1-engines
```
  f92ae8d6
08 Dec, 2006 3 commits
- Merge chilla.local:/home/mydev/mysql-4.1-axmrg · c583a7ba
  istruewing@chilla.local authored Dec 08, 2006
```
into  chilla.local:/home/mydev/mysql-5.0-axmrg
```
  c583a7ba
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · df2b9343
  istruewing@chilla.local authored Dec 08, 2006
```
into  chilla.local:/home/mydev/mysql-5.0-axmrg
```
  df2b9343
- Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · ca62c942
  istruewing@chilla.local authored Dec 08, 2006
```
into  chilla.local:/home/mydev/mysql-4.1-axmrg
```
  ca62c942
07 Dec, 2006 1 commit

BUG#23404 - ROW_FORMAT=FIXED option is lost is an index is added to the · e17d7bce

svoj@mysql.com/april.(none) authored Dec 07, 2006

            table

ROW_FORMAT option is lost during CREATE/DROP INDEX.

This fix forces CREATE/DROP INDEX to retain ROW_FORMAT by instructing
mysql_alter_table() that ROW_FORMAT is not used during creating/dropping
indexes.

e17d7bce

06 Dec, 2006 3 commits
- Only call mysql_server_end if mysql_server_init has been called. · 94eb027f
  msvensson@neptunus.(none) authored Dec 06, 2006
```
Remove DBUG_ENTER in my_end
```
  94eb027f
- Flush stderr after print of error message to get predictable output · eb1ba91d
  msvensson@neptunus.(none) authored Dec 06, 2006
  
  eb1ba91d
- Adjust replace to mask win paths · 8022e9fc
  msvensson@neptunus.(none) authored Dec 06, 2006
  
  8022e9fc
05 Dec, 2006 13 commits
- Merge bk-internal:/home/bk/mysql-5.0-maint · 7cb305ca
  msvensson@neptunus.(none) authored Dec 05, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  7cb305ca
- Merge bk-internal:/home/bk/mysql-4.1-maint · b9a4ae99
  msvensson@neptunus.(none) authored Dec 05, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
```
  b9a4ae99
- Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint · 244ec63a
  msvensson@neptunus.(none) authored Dec 05, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  244ec63a
- Remove hack that removes vardir · be212d34
  msvensson@neptunus.(none) authored Dec 05, 2006
  
  be212d34
- Merge bk-internal:/home/bk/mysql-4.1-build · a5074597
  msvensson@neptunus.(none) authored Dec 05, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
```
  a5074597
- Cset exclude: msvensson@neptunus.(none)|ChangeSet|20061204181655|04883 · 6d71f747
  msvensson@neptunus.(none) authored Dec 05, 2006
  
  6d71f747
- Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my41-bug20836 · 40aba03e
  iggy@rolltop.ignatz42.dyndns.org authored Dec 05, 2006
```
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint
```
  40aba03e
- Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my50-bug20836 · ee853682
  iggy@rolltop.ignatz42.dyndns.org authored Dec 05, 2006
```
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
```
  ee853682
- Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my41-bug20836 · 5dcf5531
  iggy@rolltop.ignatz42.dyndns.org authored Dec 05, 2006
```
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my50-bug20836
```
  5dcf5531
- Bug#20836 Selecting into variables results in wrong results being returned · 71970547
  iggy@rolltop.ignatz42.dyndns.org authored Dec 05, 2006
```
- Comment Cleanup.
```
  71970547
- Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 · 58baec3f
  msvensson@neptunus.(none) authored Dec 05, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  58baec3f
- re-enable multiple test runs in sequence for 4.1 on non-windows · 6541302b
  df@kahlann.erinye.com authored Dec 05, 2006
  
  6541302b
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 · f8bd5d31
  mskold/marty@mysql.com/linux.site authored Dec 05, 2006
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
```
  f8bd5d31
04 Dec, 2006 18 commits
- Merge kpettersson@bk-internal:/home/bk/mysql-5.0-maint · 57f78d4d
  thek@kpdesk.mysql.com authored Dec 04, 2006
```
into  kpdesk.mysql.com:/home/thek/dev/tmp/mysql-5.0-maint
```
  57f78d4d
- Disabled flush2 until pushbuild framework can handle test which · 05410c7d
  thek@kpdesk.mysql.com authored Dec 04, 2006
```
disables binlog.
```
  05410c7d
- Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my41-bug20836 · e0eed3a3
  iggy@rolltop.ignatz42.dyndns.org authored Dec 04, 2006
```
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint
```
  e0eed3a3
- Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my50-bug20836 · f4279358
  iggy@rolltop.ignatz42.dyndns.org authored Dec 04, 2006
```
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
```
  f4279358
- Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint · 2f79d20b
  msvensson@neptunus.(none) authored Dec 04, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  2f79d20b
- Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 · 128b73fc
  msvensson@neptunus.(none) authored Dec 04, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  128b73fc
- mysqltest · 544d0c90
  msvensson@neptunus.(none) authored Dec 04, 2006
```
Close any statements that might be open before program exit
Close any statments that might be open when calling "disable_ps_protocol"
```
  544d0c90
- mysql-test-run.pl: Append .nlm to the binary name on NetWare · 877c037a
  msvensson@neptunus.(none) authored Dec 04, 2006
  
  877c037a
- Merge bk-internal:/home/bk/mysql-5.0-maint · db3a21e7
  msvensson@neptunus.(none) authored Dec 04, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  db3a21e7
- Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 · 33c248ee
  msvensson@neptunus.(none) authored Dec 04, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
```
  33c248ee
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 098abfad
  istruewing@chilla.local authored Dec 04, 2006
```
into  chilla.local:/home/mydev/mysql-5.0-axmrg
```
  098abfad
- Merge bk-internal:/home/bk/mysql-4.1-maint · a9f4f4ed
  msvensson@neptunus.(none) authored Dec 04, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
```
  a9f4f4ed
- Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 9a8d3db4
  istruewing@chilla.local authored Dec 04, 2006
```
into  chilla.local:/home/mydev/mysql-4.1-axmrg
```
  9a8d3db4
- Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug17951/my50-bug17951 · a13e3ebe
  iggy@rolltop.ignatz42.dyndns.org authored Dec 04, 2006
```
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
```
  a13e3ebe
- Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0-opt · d253588c
  gkodinov@dl145s.mysql.com authored Dec 04, 2006
```
into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.0
```
  d253588c
- Bug#24389 mysqltest: Could not open connection 'default': 2013 Lost connection to MySQL · c2488ba1
  msvensson@neptunus.(none) authored Dec 04, 2006
```
 - Add CR_CONN_HOST_ERROR to list of errorcode that trigger another connection
   attempt in mysqltest
```
  c2488ba1
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 · 6e8f99d2
  mskold/marty@mysql.com/linux.site authored Dec 04, 2006
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
```
  6e8f99d2
- Merge naruto.:C:/cpp/bug17733/my50-bug17733 · f91e48c7
  Kristofer.Pettersson@naruto. authored Dec 04, 2006
```
into  naruto.:C:/cpp/mysql-5.0-maint
```
  f91e48c7