Commits · 4aebc4b3fc15d5e1d6180c93480d0e18ceac5134 · nexedi / MariaDB

18 Jan, 2005 14 commits
- Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 · 4aebc4b3
  guilhem@mysql.com authored Jan 18, 2005
```
into mysql.com:/home/mysql_src/mysql-5.0-clean
```
  4aebc4b3
- compile error fix · 57c28426
  tomas@poseidon.ndb.mysql.com authored Jan 18, 2005
  
  57c28426
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 9fb87a77
  tomas@poseidon.ndb.mysql.com authored Jan 18, 2005
```
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
```
  9fb87a77
- Merge mysql.com:/space/my/mysql-4.1 into mysql.com:/space/my/mysql-5.0 · e4d1e0e9
  lenz@mysql.com authored Jan 18, 2005
  
  e4d1e0e9
- Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 · 69bfcfe3
  lenz@mysql.com authored Jan 18, 2005
```
into mysql.com:/space/my/mysql-4.1
```
  69bfcfe3
- Merge mysql.com:/home/mysql_src/mysql-4.1-clean · 5fbdd9bd
  guilhem@mysql.com authored Jan 18, 2005
```
into mysql.com:/home/mysql_src/mysql-5.0-clean
```
  5fbdd9bd
- Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 · 9569b022
  guilhem@mysql.com authored Jan 18, 2005
```
into mysql.com:/home/mysql_src/mysql-4.1-clean
```
  9569b022
- Merge mysql.com:/usr/home/bar/mysql-4.1 · b2dbddc3
  bar@mysql.com authored Jan 18, 2005
```
into mysql.com:/usr/home/bar/mysql-5.0
```
  b2dbddc3
- #7874: CONCAT() gives wrong results mixing latin1 field and utf8 string literals · 8f23e902
  bar@mysql.com authored Jan 18, 2005
```
We should not overwrite res if it is returned from a const item.
```
  8f23e902
- After merge fixes · 9ad75d8c
  monty@mysql.com authored Jan 18, 2005
  
  9ad75d8c
- Merge with global tree · 502ba93b
  monty@mysql.com authored Jan 18, 2005
  
  502ba93b
- Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1 · edffca82
  monty@mysql.com authored Jan 18, 2005
  
  edffca82
- Fixed new bug that caused symlink test to fail · e5b78814
  monty@mysql.com authored Jan 18, 2005
  
  e5b78814
- Anoter fix for moved IO_CACHE object · 5ba79d72
  monty@mysql.com authored Jan 18, 2005
  
  5ba79d72
17 Jan, 2005 26 commits
- Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · fd3d976f
  bell@sanja.is.com.ua authored Jan 18, 2005
```
into sanja.is.com.ua:/home/bell/mysql/bk/work-valgrind-4.1
```
  fd3d976f
- Fix for BUG#7965 "Slave_IO_State Stuck at 'Checking Master Version'": · 5e43cf86
  guilhem@mysql.com authored Jan 17, 2005
```
Working around hang of master < 3.23.50 on SELECT @@unknown_var
(to enable 3.23.49->4.1.10 replication)
```
  5e43cf86
- Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1 · da9f7c7e
  reggie@bob.(none) authored Jan 17, 2005
```
into bob.(none):/home/reggie/bk/mysql-4.1
```
  da9f7c7e
- Bug #7966 query cache doesn't work properly with batch statements · e1dc421a
  reggie@bob.(none) authored Jan 17, 2005
```
sql_lex.cc:
  Set query to not cacheable if we are using multistatements and there are multiple statements in this query
```
  e1dc421a
- Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 · b9f3f4a2
  lenz@mysql.com authored Jan 17, 2005
```
into mysql.com:/space/my/mysql-4.1
```
  b9f3f4a2
- Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 · 63689a21
  paul@kite-hub.kitebird.com authored Jan 17, 2005
```
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
```
  63689a21
- Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 · c84180d2
  lenz@mysql.com authored Jan 17, 2005
```
into mysql.com:/space/my/mysql-4.1
```
  c84180d2
- Merge mysql.com:/space/my/mysql-4.0 · b1cb5ea4
  lenz@mysql.com authored Jan 17, 2005
```
into mysql.com:/space/my/mysql-4.1-build
```
  b1cb5ea4
- backported from 5.0 patch initialization of main select for commands where subqueries are possible · dcfdf011
  bell@sanja.is.com.ua authored Jan 17, 2005
  
  dcfdf011
- Allow "classic" builds (= without InnoDB) by eliminating an "unresolved reference" (bug#7961). · 88b1fbaf
  joerg@mysql.com authored Jan 17, 2005
  
  88b1fbaf
- Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 · 43f98d24
  paul@kite-hub.kitebird.com authored Jan 17, 2005
```
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
```
  43f98d24
- - Enabled the handling of architecture extensions e.g. "-64bit" when building · 09a71351
  lenz@mysql.com authored Jan 17, 2005
```
  Mac OS X PKGs with Do-pkg
```
  09a71351
- Fixed memory leak in handle_local_infile() · c46f5274
  kaa@polly.local authored Jan 17, 2005
  
  c46f5274
- Fix for BUG#7331 merged manually from 4.1. · bb77b2e5
  timour@mysql.com authored Jan 17, 2005
  
  bb77b2e5
- Merge mysql.com:/home/timka/mysql/src/4.1-virgin · 50e04743
  timour@mysql.com authored Jan 17, 2005
```
into mysql.com:/home/timka/mysql/src/4.1-bug-7331
```
  50e04743
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 9dbe52bd
  tomas@poseidon.ndb.mysql.com authored Jan 17, 2005
```
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
```
  9dbe52bd
- Bug#7937 · beffd062
  tomas@poseidon.ndb.mysql.com authored Jan 17, 2005
  
  beffd062
- Merge mysql.com:/home/timka/mysql/src/4.1-virgin · 06fce173
  timour@mysql.com authored Jan 17, 2005
```
into mysql.com:/home/timka/mysql/src/4.1-bug-7331
```
  06fce173
- user_var.result: · 2933cd3d
  bar@deer.(none) authored Jan 17, 2005
```
  after merge fix
```
  2933cd3d
- func_str.result: · 3b7eb23e
  bar@deer.(none) authored Jan 17, 2005
```
  after merge fix
```
  3b7eb23e
- Merge · 3d471442
  bar@mysql.com authored Jan 17, 2005
  
  3d471442
- user_var.result, func_str.result, item_strfunc.cc: · e7e5e8b1
  bar@mysql.com authored Jan 17, 2005
```
  bug#7839 ncorrect collation for char(ascii('a'))
```
  e7e5e8b1
- mysqldump.c: · 3b9c5f3a
  paul@kite-hub.kitebird.com authored Jan 17, 2005
```
  Move out-of-order option.
```
  3b9c5f3a
- Merge mysql.com:/usr/home/bar/mysql-4.1 · d91cd61a
  bar@mysql.com authored Jan 17, 2005
```
into mysql.com:/usr/home/bar/mysql-5.0
```
  d91cd61a
- libmysql.c: · 308aec15
  bar@mysql.com authored Jan 17, 2005
```
  bug#7891: mysql_character_set_name() returns collation
```
  308aec15
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · c6e5521b
  tomas@poseidon.ndb.mysql.com authored Jan 17, 2005
```
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
```
  c6e5521b