Commits · 7a761a2545e9407cd46f641062b464073081a210 · Kirill Smelkov / mariadb

23 Sep, 2006 5 commits
- Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge · 7a761a25
  lars/lthalmann@mysql.com/dl145k.mysql.com authored Sep 23, 2006
```
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
```
  7a761a25
- Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 · 7ce96bb5
  lars/lthalmann@mysql.com/dl145j.mysql.com authored Sep 23, 2006
```
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
```
  7ce96bb5
- Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1 · 80dadacb
  lars/lthalmann@mysql.com/dl145h.mysql.com authored Sep 23, 2006
```
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
```
  80dadacb
- Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl · bbf84d6b
  lars/lthalmann@mysql.com/dl145h.mysql.com authored Sep 23, 2006
```
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
```
  bbf84d6b
- Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl · 7e45d803
  lars/lthalmann@mysql.com/dl145h.mysql.com authored Sep 23, 2006
```
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
```
  7e45d803
22 Sep, 2006 2 commits
- Fix for bug #19121: Windows incompatible udf_example · 67a70100
  georg@lmy002.wdf.sap.corp authored Sep 22, 2006
  
  67a70100
- Added build rule for mysql_upgrade.exe · ca00ba49
  georg@lmy002.wdf.sap.corp authored Sep 22, 2006
  
  ca00ba49
21 Sep, 2006 9 commits
- Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 · 17218bd7
  joerg@trift2. authored Sep 21, 2006
```
into  trift2.:/MySQL/M50/push-5.0
```
  17218bd7
- Add a dummy file for "Docs/manual.chm" as we need it for "make dist" to work. · d1f0a57a
  joerg@trift2. authored Sep 21, 2006
  
  d1f0a57a
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 64fbabc5
  istruewing@chilla.local authored Sep 21, 2006
```
into  chilla.local:/home/mydev/mysql-5.0-toteam
```
  64fbabc5
- Merge trift2.:/MySQL/M50/extract1-5.0 · 3acb6778
  joerg@trift2. authored Sep 21, 2006
```
into  trift2.:/MySQL/M50/push-5.0
```
  3acb6778
- After merge fixes · 738cd74b
  lars/lthalmann@mysql.com/dl145j.mysql.com authored Sep 21, 2006
  
  738cd74b
- Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge · 2c5dc57e
  lars/lthalmann@mysql.com/dl145j.mysql.com authored Sep 21, 2006
```
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
```
  2c5dc57e
- Adding proper setup phase for test case rpl_insert_id · 9538acf5
  lars/lthalmann@mysql.com/dl145h.mysql.com authored Sep 21, 2006
  
  9538acf5
- Merge chilla.local:/home/mydev/mysql-5.0--main · f083782c
  istruewing@chilla.local authored Sep 21, 2006
```
into  chilla.local:/home/mydev/mysql-5.0-toteam
```
  f083782c
- Vertical printout in test to make easier to read · fe782f92
  lars/lthalmann@mysql.com/dl145h.mysql.com authored Sep 21, 2006
  
  fe782f92
20 Sep, 2006 5 commits
- Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge · 95d0ae96
  lars/lthalmann@mysql.com/dl145h.mysql.com authored Sep 21, 2006
```
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
```
  95d0ae96
- Fix of result files from merge · 6aded456
  lars/lthalmann@mysql.com/dl145h.mysql.com authored Sep 21, 2006
  
  6aded456
- Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl · d20e3265
  lars/lthalmann@mysql.com/dl145j.mysql.com authored Sep 21, 2006
```
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
```
  d20e3265
- Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl · 0c03f934
  lars/lthalmann@mysql.com/dl145j.mysql.com authored Sep 20, 2006
```
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
```
  0c03f934
- Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines · 1782889d
  istruewing@chilla.local authored Sep 20, 2006
```
into  chilla.local:/home/mydev/mysql-4.1-bug14400-monty
```
  1782889d
19 Sep, 2006 4 commits
- After merge fix. · 7419f502
  istruewing@chilla.local authored Sep 19, 2006
  
  7419f502
- Merge chilla.local:/home/mydev/mysql-4.1-bug14400-monty · 5d509b32
  istruewing@chilla.local authored Sep 19, 2006
```
into  chilla.local:/home/mydev/mysql-5.0-bug14400-monty
```
  5d509b32
- Merge bk-internal:/home/bk/mysql-4.0 · 47dc3fbe
  istruewing@chilla.local authored Sep 19, 2006
```
into  chilla.local:/home/mydev/mysql-4.1-bug14400-monty
```
  47dc3fbe
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines · 3307d448
  istruewing@chilla.local authored Sep 19, 2006
```
into  chilla.local:/home/mydev/mysql-5.0--team
```
  3307d448
18 Sep, 2006 9 commits
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines · 418c1f30
  istruewing@chilla.local authored Sep 18, 2006
```
into  chilla.local:/home/mydev/mysql-5.0--team
```
  418c1f30
- Merge may.pils.ru:/home/svoj/devel/mysql/merge/mysql-4.1 · 43097593
  svoj@may.pils.ru authored Sep 18, 2006
```
into  may.pils.ru:/home/svoj/devel/mysql/merge/mysql-4.1-engines
```
  43097593
- Merge bk-internal:/home/bk/mysql-5.0 · cf9d1c91
  gkodinov@dl145s.mysql.com authored Sep 18, 2006
```
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
```
  cf9d1c91
- Merge april.(none):/home/svoj/devel/bk/mysql-4.1-engines · f53f015b
  svoj@april.(none) authored Sep 18, 2006
```
into  april.(none):/home/svoj/devel/mysql/merge/mysql-5.0-engines
```
  f53f015b
- Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 · f21eadfc
  svoj@april.(none) authored Sep 18, 2006
```
into  april.(none):/home/svoj/devel/mysql/merge/mysql-5.0-engines
```
  f21eadfc
- Merge bk-internal:/home/bk/mysql-5.0-opt · 2ec485f0
  gkodinov@dl145s.mysql.com authored Sep 18, 2006
```
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
```
  2ec485f0
- merge fixes · fae596aa
  gkodinov@dl145s.mysql.com authored Sep 18, 2006
  
  fae596aa
- Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt · 522823b5
  gkodinov@dl145s.mysql.com authored Sep 18, 2006
```
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
```
  522823b5
- Merge bk-internal:/home/bk/mysql-4.1-opt · fcf99e85
  gkodinov@dl145s.mysql.com authored Sep 18, 2006
```
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt
```
  fcf99e85
17 Sep, 2006 1 commit
- BUG#19419: VIEW: View that the column name is different · e2d15b16
  aivanov/alexi@mysql.com/mysqld.localdomain authored Sep 18, 2006
```
 by master and slave is made.
```
  e2d15b16
16 Sep, 2006 1 commit

Fixed bug #21493: crash for the second execution of a function · d3d3cef8

igor@rurik.mysql.com authored Sep 16, 2006

containing a select statement that uses an aggregating IN subquery.
Added a parameter to the function fix_prepare_information
to restore correctly the having clause for the second execution.
Saved andor structure of the having conditions at the proper moment
before any calls of split_sum_func2 that could modify the having structure
adding new Item_ref objects. (These additions, are produced not with
the statement mem_root, but rather with the execution mem_root.)

d3d3cef8

15 Sep, 2006 4 commits
- Merge shellback.(none):/home/msvensson/mysql/work/my50-work · d8e27606
  msvensson@shellback.(none) authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  d8e27606
- Merge bk-internal:/home/bk/mysql-4.1-opt · c73d2318
  gkodinov/kgeorge@macbook.gmz authored Sep 15, 2006
```
into  macbook.gmz:/Users/kgeorge/mysql/work/B21180-4.1-opt
```
  c73d2318
- Add definition of SHUT_RDWR for compiling on windows · 6a0841a1
  msvensson@shellback.(none) authored Sep 15, 2006
  
  6a0841a1
- Merge bk-internal:/home/bk/mysql-5.0-maint · b0fc6840
  msvensson@shellback.(none) authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  b0fc6840