Commits · 11cdca9a2fc77be1a43acfd6b1734b65659f9ae1 · Kirill Smelkov / mariadb

12 Dec, 2006 4 commits
- Merge olga.mysql.com:/home/igor/mysql-4.1-opt · 11cdca9a
  igor@olga.mysql.com authored Dec 12, 2006
```
into  olga.mysql.com:/home/igor/mysql-5.0-opt
```
  11cdca9a
- Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt · 635a5641
  gluh@mysql.com/gluh.(none) authored Dec 12, 2006
```
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
```
  635a5641
- Merge mysql.com:/home/gluh/MySQL/Merge/5.0 · 118a0c7f
  gluh@mysql.com/gluh.(none) authored Dec 12, 2006
```
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
```
  118a0c7f
- Fixed bug #24670: optimizations that are legal only for subqueries without tables · 53d97a7d
  igor@olga.mysql.com authored Dec 11, 2006
```
and no WHERE condition were applied for any subquery without tables.
```
  53d97a7d
11 Dec, 2006 1 commit
- Merge mysql.com:/home/gluh/MySQL/Merge/4.1 · f0f4d3c0
  gluh@mysql.com/gluh.(none) authored Dec 11, 2006
```
into  mysql.com:/home/gluh/MySQL/Merge/4.1-opt
```
  f0f4d3c0
07 Dec, 2006 2 commits
- merging fix · 4f0c9c43
  holyfoot/hf@mysql.com/deer.(none) authored Dec 07, 2006
  
  4f0c9c43
- merging · 9203d434
  holyfoot/hf@mysql.com/deer.(none) authored Dec 07, 2006
  
  9203d434
06 Dec, 2006 6 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
- Merge mysql.com:/home/hf/work/22372/my41-22372 · 9e52ef1f
  holyfoot/hf@mysql.com/deer.(none) authored Dec 06, 2006
```
into  mysql.com:/home/hf/work/22372/my50-22372
```
  9e52ef1f
- bug #22372 · f404488d
  holyfoot/hf@mysql.com/deer.(none) authored Dec 06, 2006
```
datafile added to be used in gis.test
```
  f404488d
- bug #22372 (LOAD DATA crashes the table with the geometry field) · e83c682f
  holyfoot/hf@mysql.com/deer.(none) authored Dec 06, 2006
```
The problem is that the GEOMETRY NOT NULL can't automatically set
any value as a default one. We always tried to complete LOAD DATA
command even if there's not enough data in file. That doesn't work
for GEOMETRY NOT NULL. Now Field_*::reset() returns an error sign
and it's checked in mysql_load()
```
  e83c682f
- 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 14 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:/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 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