Commits · fb17025b3ea4983feec4498ab1f807b22a95d099 · Kirill Smelkov / mariadb

21 May, 2004 1 commit
- WL#1622 "SQL Syntax for Prepared Statements": Post-review fixes (1 of 2) · fb17025b
  sergefp@mysql.com authored May 21, 2004
  
  fb17025b
14 May, 2004 12 commits
- Trivial manual merge · 3711c98b
  sergefp@mysql.com authored May 15, 2004
  
  3711c98b
- CXX linker specified for client_test with libmysqld · e81c6e17
  hf@deer.(none) authored May 14, 2004
  
  e81c6e17
- Merge marko@build.mysql.com:/home/bk/mysql-4.1 · a4489d39
  marko@hundin.mysql.fi authored May 14, 2004
```
into hundin.mysql.fi:/home/marko/j/mysql-4.1
```
  a4489d39
- InnoDB cleanup: eliminate IB__FILE__ · a5cca9df
  marko@hundin.mysql.fi authored May 14, 2004
  
  a5cca9df
- Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 3f685711
  bell@sanja.is.com.ua authored May 14, 2004
```
into sanja.is.com.ua:/home/bell/mysql/bk/work-all_any2-4.1
```
  3f685711
- InnoDB: ut0mem: Remove ut_str_catenate(), add const qualifiers · 3c87eda7
  marko@hundin.mysql.fi authored May 14, 2004
  
  3c87eda7
- InnoDB: Disable file locking on FreeBSD · 3a9e5901
  marko@hundin.mysql.fi authored May 14, 2004
  
  3a9e5901
- Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1 · a7177178
  bell@sanja.is.com.ua authored May 14, 2004
```
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
```
  a7177178
- fixed flags of printed query · 8f957583
  bell@sanja.is.com.ua authored May 14, 2004
  
  8f957583
- Bug #3403 Wrong encoding in EXPLAIN SELECT output · 6ecea2fa
  bar@bar.intranet.mysql.r18.ru authored May 14, 2004
  
  6ecea2fa
- Bug #3403 Wrong encoding in SHOW GRANTS, EPLAIN SELECT output · 2fc1d5c1
  bar@bar.intranet.mysql.r18.ru authored May 14, 2004
```
This change fixes SHOW GRANTS problem, while EXPLAIN will be fixed
in a separate patch.
```
  2fc1d5c1
- sql_table.cc: · 9bf1be45
  heikki@hundin.mysql.fi authored May 14, 2004
```
  Fix bug #3749: if there were several indexs that made an automatically generated FOREIGN KEY index redundant, then MySQL miscalculated the number of keys, and the AUTO_INCREMENT flag was forgotten by MySQL from a PRIMARY KEY. There were probably a multitude of other errors caused by this.
```
  9bf1be45
13 May, 2004 12 commits
- Merge bk-internal:/home/bk/mysql-4.1/ · 5981f5d1
  serg@serg.mylan authored May 14, 2004
```
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
```
  5981f5d1
- compatibility fix for hp-ux 64bit (hpux compiler) and sun 64-bit (sun forte) · 0d3b0838
  serg@serg.mylan authored May 14, 2004
  
  0d3b0838
- fixed flags of printed query · 4c774e0c
  bell@sanja.is.com.ua authored May 13, 2004
  
  4c774e0c
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · 0422d559
  tomas@mc05.(none) authored May 13, 2004
```
into mc05.(none):/space/tomas/mysql-4.1-ndb
```
  0422d559
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · ca4f6d3c
  tomas@mc05.(none) authored May 13, 2004
```
into mc05.(none):/space/tomas/mysql-4.1-ndb
```
  ca4f6d3c
- Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 1a2930dc
  hf@deer.(none) authored May 13, 2004
```
into deer.(none):/home/hf/work/mysql-4.1.ps
```
  1a2930dc
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · 8e84ee65
  tomas@mc05.(none) authored May 13, 2004
```
into mc05.(none):/space2/tomas/mysql-4.1
```
  8e84ee65
- portability fix for MACOSX bugreport 3735 · 31ec8a6f
  tomas@mc05.(none) authored May 13, 2004
  
  31ec8a6f
- portability fixes · d7958e9b
  tomas@mc05.(none) authored May 13, 2004
  
  d7958e9b
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · e6d97bc7
  tomas@mc05.(none) authored May 13, 2004
```
into mc05.(none):/space/tomas/mysql-4.1-ndb
```
  e6d97bc7
- Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · e74320d6
  hf@deer.(none) authored May 13, 2004
```
into deer.(none):/home/hf/work/mysql-4.1.ps
```
  e74320d6
- client_test with embedded library will be built so one can check if he broke · a4bbf5d1
  hf@deer.(none) authored May 13, 2004
```
something in embedded PS
```
  a4bbf5d1
12 May, 2004 15 commits
- Only compile SHM if configured to · 47b7c561
  joreland@mysql.com authored May 12, 2004
  
  47b7c561
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · e5ccb1cc
  tomas@mc05.(none) authored May 12, 2004
```
into mc05.(none):/space/tomas/mysql-4.1-ndb
```
  e5ccb1cc
- Merge build.mysql.com:/home/bk/mysql-4.1 · de464333
  tulin@build.mysql.com authored May 12, 2004
```
into build.mysql.com:/users/tulin/mysql-4.1
```
  de464333
- regression.sh: · aa161b3b
  tulin@build.mysql.com authored May 12, 2004
```
  fixed typo
```
  aa161b3b
- Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 5384fbc0
  bell@sanja.is.com.ua authored May 12, 2004
```
into sanja.is.com.ua:/home/bell/mysql/bk/work-union-4.1
```
  5384fbc0
- Daemon code to run on all unixes · 77f9069c
  tomas@mc05.(none) authored May 12, 2004
  
  77f9069c
- NdbMutex.h: · ac92bd58
  tomas@mc05.(none) authored May 12, 2004
```
  oops forgot this one
```
  ac92bd58
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 7df573ed
  tomas@mc05.(none) authored May 12, 2004
```
into mc05.(none):/space/tomas/mysql-4.1-ndb
```
  7df573ed
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · 216c3a3b
  joreland@mysql.com authored May 12, 2004
```
into mysql.com:/home/jonas/src/mysql-4.1
```
  216c3a3b
- Fix broken arg fot getrlimit · 8dfb87ba
  ejonore@mc03.ndb.mysql.com authored May 12, 2004
  
  8dfb87ba
- portability/autoconf fixes · f586a85b
  tomas@mc05.(none) authored May 12, 2004
  
  f586a85b
- used item method (Bug #3686) · 7defcb47
  bell@sanja.is.com.ua authored May 12, 2004
  
  7defcb47
- portability/autoconf fixes · 6fb4bea1
  tomas@mc05.(none) authored May 12, 2004
  
  6fb4bea1
- Merge mysql.com:/home/mydev/mysql-4.1 · 41f1ed23
  ingo@mysql.com authored May 12, 2004
```
into mysql.com:/home/mydev/mysql-4.1-wl1687
```
  41f1ed23
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · a5e9e473
  tomas@mc05.(none) authored May 12, 2004
```
into mc05.(none):/space2/tomas/mysql-4.1
```
  a5e9e473