Commits · 1d8a6a06a5030d408b82294594ed49036be66cbd · Kirill Smelkov / mariadb

12 Nov, 2004 4 commits
- Merge avenger.(none):/export/brian/mysql/test/4.1 · 1d8a6a06
  brian@avenger.(none) authored Nov 11, 2004
```
into avenger.(none):/export/brian/mysql/test/5.0
```
  1d8a6a06
- Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 · b5e02d32
  brian@avenger.(none) authored Nov 11, 2004
```
into avenger.(none):/export/brian/mysql/test/5.0
```
  b5e02d32
- Mainly resolving Guilhem's 4.1 patch to 5.0 · 3e4ca194
  brian@avenger.(none) authored Nov 11, 2004
  
  3e4ca194
- Resolved merge from 4.1 -> 5.0 (mainly Guilhem's work with mysqldump) · f05daf02
  brian@avenger.(none) authored Nov 11, 2004
  
  f05daf02
11 Nov, 2004 35 commits
- Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 · 8c2f17d1
  paul@kite-hub.kitebird.com authored Nov 11, 2004
```
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
```
  8c2f17d1
- mysqldump.c: · af8d3612
  paul@kite-hub.kitebird.com authored Nov 11, 2004
```
  Reorder options, revise --hex-blob help string.
```
  af8d3612
- Rename: send_prepare_results -> check_prepared_statement (sql_prepare.cc) · dad42cb4
  konstantin@mysql.com authored Nov 11, 2004
  
  dad42cb4
- mi_write: fix for ft2 when found word (in the tree) has different length as the word to insert · 0be3c555
  serg@serg.mylan authored Nov 11, 2004
  
  0be3c555
- Few more places with thd->lex replaced with lex (mysql_update, · 1d32e06b
  konstantin@mysql.com authored Nov 11, 2004
```
check_simple_select). This change was inspired by Monty in December 2003
when thd->lex became a pointer in 4.1.
```
  1d32e06b
- trx0purge.c: · 38cae36c
  heikki@hundin.mysql.fi authored Nov 11, 2004
```
  Remove duplicated innodb max purge lag code
```
  38cae36c
- Cleanup: thd->lex->select_lex -> select_lex (sql_delete.cc) · 6ccdd6c4
  konstantin@mysql.com authored Nov 11, 2004
  
  6ccdd6c4
- Cleanup in sql_acl.cc: thd->lex ->lex · baf97714
  konstantin@mysql.com authored Nov 11, 2004
  
  baf97714
- Rename: Item::val -> Item::val_real(). · e5f4c7a0
  konstantin@mysql.com authored Nov 11, 2004
  
  e5f4c7a0
- post-merge fixes for WL#1972 · ea97ce50
  timour@mysql.com authored Nov 11, 2004
  
  ea97ce50
- Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 6f39bf2b
  acurtis@pcgem.rdg.cyberkinetica.com authored Nov 11, 2004
```
into pcgem.rdg.cyberkinetica.com:/usr/home/acurtis/work/bug6469
```
  6f39bf2b
- Merge pcgem.rdg.cyberkinetica.com:/mnt/staff/repositories/mysql-4.1 · e0527b17
  acurtis@pcgem.rdg.cyberkinetica.com authored Nov 11, 2004
```
into pcgem.rdg.cyberkinetica.com:/usr/home/acurtis/work/bug6469
```
  e0527b17
- ndb_test_platform.cpp: · 09ee9734
  tomas@poseidon.ndb.mysql.com authored Nov 11, 2004
```
  better printouts in ndb_test_platform
```
  09ee9734
- waiter.cpp: · 37d1b4ec
  tomas@poseidon.ndb.mysql.com authored Nov 11, 2004
```
  fixed so that connectring option works
```
  37d1b4ec
- Merge mysql.com:/home/timka/mysql/src/5.0-virgin · 7073829f
  timour@mysql.com authored Nov 11, 2004
```
into mysql.com:/home/timka/mysql/src/5.0-1972
```
  7073829f
- mysql-test-run.sh: · 33bb73da
  tomas@poseidon.ndb.mysql.com authored Nov 11, 2004
```
  made sleep time for second master larger so that it has time to start
```
  33bb73da
- basestring_vsnprintf fix for size==0 · 399ad08e
  tomas@poseidon.ndb.mysql.com authored Nov 11, 2004
  
  399ad08e
- Fixing filename case problems in sql_base.cc for views on MacOS X. (With help from sanja :) · aa6d99dd
  pem@mysql.comhem.se authored Nov 11, 2004
  
  aa6d99dd
- Merge mysql.com:/usr/local/bk/mysql-5.0 · 9c115a21
  pem@mysql.com authored Nov 11, 2004
```
into mysql.com:/home/pem/work/mysql-5.0
```
  9c115a21
- Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 · 8f010dd9
  joerg@mysql.com authored Nov 11, 2004
```
into mysql.com:/M50/mysql-5.0
```
  8f010dd9
- forgot a return 0 · e0a3e48f
  tomas@poseidon.ndb.mysql.com authored Nov 11, 2004
```
    removed some errorcodes not used
```
  e0a3e48f
- Corrected a syntax error detected in test build. · 437a80ed
  joerg@mysql.com authored Nov 11, 2004
  
  437a80ed
- Merge mysql.com:/usr/local/bk/mysql-5.0 · b02c1641
  pem@mysql.com authored Nov 11, 2004
```
into mysql.com:/home/pem/work/mysql-5.0
```
  b02c1641
- Updated lowercase_table2.results. (show tables output has changed) · b6976267
  pem@mysql.comhem.se authored Nov 11, 2004
  
  b6976267
- '5.4', -1, HALF_UP · d74b5499
  serg@serg.mylan authored Nov 11, 2004
```
fixed
```
  d74b5499
- ndbcluster.sh: · fd39778f
  tomas@poseidon.ndb.mysql.com authored Nov 11, 2004
```
  fixed typo
```
  fd39778f
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 8b0101a0
  tomas@poseidon.ndb.mysql.com authored Nov 11, 2004
```
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
```
  8b0101a0
- added ndb error codes and better explanations · 6a9cbe48
  tomas@poseidon.ndb.mysql.com authored Nov 11, 2004
  
  6a9cbe48
- Merge of WL#1972 "Evaluate HAVING before SELECT select-list" · e61b4454
  timour@mysql.com authored Nov 11, 2004
  
  e61b4454
- Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 · 5d35cc0d
  guilhem@mysql.com authored Nov 11, 2004
```
into mysql.com:/home/mysql_src/mysql-4.1-clean
```
  5d35cc0d
- Fix for autobuild failure: forgotten ';' (bison 1.875 accepts if it's not there, but 1.75 does not) · 91a40d42
  guilhem@mysql.com authored Nov 11, 2004
  
  91a40d42
- WL#1972 - manual merge with latest bk source tree · 9a4ffb5a
  timour@mysql.com authored Nov 11, 2004
  
  9a4ffb5a
- WL#1972 - manual merge with latest bk source · 71c4cc4a
  timour@mysql.com authored Nov 11, 2004
  
  71c4cc4a
- Added ending ';' for the start_transaction_opts: · 582f9a89
  ram@gw.mysql.r18.ru authored Nov 11, 2004
  
  582f9a89
- fill_help_tables.sh: · 9ee3bf9e
  paul@ice.snake.net authored Nov 10, 2004
```
  Handle some additional Texinfo tags that were being missed.
```
  9ee3bf9e
10 Nov, 2004 1 commit
- Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 · f9a51b66
  guilhem@mysql.com authored Nov 11, 2004
```
into mysql.com:/home/mysql_src/mysql-4.1-clean
```
  f9a51b66