Commits · d29f865d3b922c849efa4af9cf95e5930617cb24 · Kirill Smelkov / mariadb

19 Dec, 2006 1 commit
- Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-engines · d29f865d
  svoj@april.(none) authored Dec 19, 2006
```
into  mysql.com:/home/svoj/devel/mysql/BUG23255/mysql-5.1-engines
```
  d29f865d
13 Dec, 2006 4 commits
- After merge fix. · a708a3b5
  svoj@mysql.com/april.(none) authored Dec 13, 2006
  
  a708a3b5
- Merge mysql.com:/home/svoj/devel/mysql/BUG23404/mysql-5.0-engines · 35e7dea8
  svoj@april.(none) authored Dec 13, 2006
```
into  mysql.com:/home/svoj/devel/mysql/BUG23404/mysql-5.1-engines
```
  35e7dea8
- 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 5 commits
- Merge chilla.local:/home/mydev/mysql-5.0-axmrg · 5c062b2b
  istruewing@chilla.local authored Dec 08, 2006
```
into  chilla.local:/home/mydev/mysql-5.1-axmrg
```
  5c062b2b
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 05dde1f3
  istruewing@chilla.local authored Dec 08, 2006
```
into  chilla.local:/home/mydev/mysql-5.1-axmrg
```
  05dde1f3
- 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 3 commits
- 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
- Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · c24381bd
  andrey@example.com authored Dec 07, 2006
```
into  example.com:/work/mysql-5.1-maint
```
  c24381bd
- Additional fix for bug#22369 · 12a68db3
  andrey@example.com authored Dec 07, 2006
  
  12a68db3
06 Dec, 2006 5 commits
- Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · 961275a3
  msvensson@neptunus.(none) authored Dec 06, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
```
  961275a3
- 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
- Initialize guarded_instance to NULL in constuctor. Avoid looping over · d1c9edf4
  msvensson@neptunus.(none) authored Dec 06, 2006
```
uninitialized list of guarded instances.
```
  d1c9edf4
05 Dec, 2006 22 commits
- Merge bk-internal:/home/bk/mysql-5.1-maint · ccec047f
  msvensson@neptunus.(none) authored Dec 05, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
```
  ccec047f
- 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-5.0-maint · 90226bbc
  msvensson@neptunus.(none) authored Dec 05, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
```
  90226bbc
- 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
- Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 · 3ad48783
  msvensson@neptunus.(none) authored Dec 05, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
```
  3ad48783
- Merge bk-internal:/home/bk/mysql-5.1 · d8e6f013
  msvensson@neptunus.(none) authored Dec 05, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
```
  d8e6f013
- Cset exclude: msvensson@neptunus.(none)|ChangeSet|20061204181655|04883 · 6d71f747
  msvensson@neptunus.(none) authored Dec 05, 2006
  
  6d71f747
- Raise version number after cloning 5.1.14-beta · 21435418
  bteam/mysqldev@mysql.com/production.mysql.com authored Dec 05, 2006
  
  21435418
- 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/my51-bug20836 · f18d064d
  iggy@rolltop.ignatz42.dyndns.org authored Dec 05, 2006
```
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint
```
  f18d064d
- Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my50-bug20836 · c1c082af
  iggy@rolltop.ignatz42.dyndns.org authored Dec 05, 2006
```
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my51-bug20836
```
  c1c082af
- 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
- BUG#23255 - Missing version parameter in plugin declaration example · 162f1443
  svoj@mysql.com/april.(none) authored Dec 05, 2006
```
Plugin interface version was not raised properly after incompatible
changes to plugin structure were introduced.

Fixed plugin interface version according to worklog 2761.
```
  162f1443
- Update rsult file after merge, error message number increased · 04ae6985
  msvensson@neptunus.(none) authored Dec 05, 2006
  
  04ae6985
- Use "sql_print_error" instead of "sql_print_warning" to get a better · dcf675d2
  msvensson@neptunus.(none) authored Dec 05, 2006
```
error message in the logs before shutting down the server
```
  dcf675d2
- mysql.binlog_index renamed to mysql.ndb_binlog_index · ea49384d
  msvensson@neptunus.(none) authored Dec 05, 2006
  
  ea49384d
- 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