Commits · 88b1fbaf2f49c33d44721d7c51a46c7c121292f3 · nexedi / MariaDB

17 Jan, 2005 8 commits
- Allow "classic" builds (= without InnoDB) by eliminating an "unresolved reference" (bug#7961). · 88b1fbaf
  joerg@mysql.com authored Jan 17, 2005
  
  88b1fbaf
- Fix for BUG#7331 merged manually from 4.1. · bb77b2e5
  timour@mysql.com authored Jan 17, 2005
  
  bb77b2e5
- 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
- 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
16 Jan, 2005 8 commits
- Merge · 05793bb9
  guilhem@mysql.com authored Jan 16, 2005
  
  05793bb9
- Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 · 6412558d
  guilhem@mysql.com authored Jan 16, 2005
```
into mysql.com:/home/mysql_src/mysql-4.1-clean
```
  6412558d
- Makefile.am: · b3471555
  tomas@poseidon.ndb.mysql.com authored Jan 16, 2005
```
  Bug#7721
```
  b3471555
- Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ · fa38a0d1
  serg@serg.mylan authored Jan 16, 2005
```
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
```
  fa38a0d1
- initialize mysql->charset in mysql_init · 8bea4729
  serg@serg.mylan authored Jan 16, 2005
  
  8bea4729
- When we warn that --log-bin alone is dangerous, we give a suggestion. · 1cb5d98d
  guilhem@mysql.com authored Jan 16, 2005
  
  1cb5d98d
- Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 · 6cc7f39d
  guilhem@mysql.com authored Jan 16, 2005
```
into mysql.com:/home/mysql_src/mysql-4.1-clean
```
  6cc7f39d
- Merge · c30e6000
  guilhem@mysql.com authored Jan 16, 2005
  
  c30e6000
15 Jan, 2005 15 commits
- don't ignore errors in readlink · ef58da54
  serg@serg.mylan authored Jan 15, 2005
  
  ef58da54
- Merge bk-internal:/home/bk/mysql-5.0 · 65b80073
  jimw@mysql.com authored Jan 15, 2005
```
into mysql.com:/home/jimw/my/mysql-5.0-clean
```
  65b80073
- Update results after merge · 96f0219d
  jimw@mysql.com authored Jan 15, 2005
  
  96f0219d
- Porting fix for bug #7586 "TIMEDIFF for sec+microsec not working properly" · 31d3aabb
  dlenev@brandersnatch.localdomain authored Jan 15, 2005
```
to 5.0 tree (since it was lost during last merge).
```
  31d3aabb
- After merge fixes · 8d616390
  monty@mysql.com authored Jan 15, 2005
```
Fix for BIT(X) field as string
```
  8d616390
- Merge with global tree · 3b0f8cab
  monty@mysql.com authored Jan 15, 2005
  
  3b0f8cab
- Merge with 4.1 · 0a1076a2
  monty@mysql.com authored Jan 15, 2005
  
  0a1076a2
- Added ndb_types.h to ignore · 97b28521
  monty@mysql.com authored Jan 15, 2005
  
  97b28521
- Changed interface for my_strntod() to make it more general and more portable · a37e91e4
  monty@mysql.com authored Jan 15, 2005
  
  a37e91e4
- Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · f34bc883
  monty@mysql.com authored Jan 15, 2005
```
into mysql.com:/home/my/mysql-4.1
```
  f34bc883
- Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 · de1ff069
  guilhem@mysql.com authored Jan 15, 2005
```
into mysql.com:/home/mysql_src/mysql-5.0-clean
```
  de1ff069
- Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 · 09f36a69
  guilhem@mysql.com authored Jan 15, 2005
```
into mysql.com:/home/mysql_src/mysql-4.1-clean
```
  09f36a69
- func_gconcat.result, func_gconcat.test: · cd577f25
  igor@rurik.mysql.com authored Jan 15, 2005
```
  Added a test case for bug #7769.
item_sum.h:
  Fixed bug #7769: a crash for queries with group_concat and
  having when the query table was empty.
  The bug was due an unsafe dereferencing.
```
  cd577f25
- Merge · 7681e624
  monty@mysql.com authored Jan 15, 2005
  
  7681e624
- Fixed possible access to unintialized memory in filesort when using many buffers · 6d280ac1
  monty@mysql.com authored Jan 15, 2005
  
  6d280ac1
14 Jan, 2005 9 commits
- protect against malicious server trying to crash command-line client :) · 275a9293
  serg@serg.mylan authored Jan 14, 2005
  
  275a9293
- Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ · 5ebcb21f
  serg@serg.mylan authored Jan 14, 2005
```
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
```
  5ebcb21f
- limit HEAP table size with max_heap_table_size, better estimation for mem_per_row · 367bcf8c
  serg@serg.mylan authored Jan 14, 2005
  
  367bcf8c
- Merge mysql.com:/home/jimw/my/mysql-5.0-6659 · a66f6b79
  jimw@mysql.com authored Jan 14, 2005
```
into mysql.com:/home/jimw/my/mysql-5.0-clean
```
  a66f6b79
- Merge mysql.com:/home/jimw/my/mysql-4.0-clean · bc7f4b2c
  jimw@mysql.com authored Jan 14, 2005
```
into mysql.com:/home/jimw/my/mysql-4.1-clean
```
  bc7f4b2c
- Merge mysql.com:/home/jimw/my/mysql-4.0-7347 · 46e44429
  jimw@mysql.com authored Jan 14, 2005
```
into mysql.com:/home/jimw/my/mysql-4.0-clean
```
  46e44429
- Merge · bdb36de9
  jimw@mysql.com authored Jan 14, 2005
  
  bdb36de9
- Merge · b6d46b3c
  jimw@mysql.com authored Jan 14, 2005
  
  b6d46b3c
- Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 · ff347ae7
  lenz@mysql.com authored Jan 14, 2005
```
into mysql.com:/space/my/mysql-4.1
```
  ff347ae7