Commits · bab374162f5cfb98eb70f0708d300a54dfbffe43 · Kirill Smelkov / mariadb

23 Sep, 2006 8 commits
- Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge · bab37416
  lars/lthalmann@dl145k.mysql.com authored Sep 23, 2006
```
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
```
  bab37416
- 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
- Disabling test case · bbbb3901
  lars/lthalmann@mysql.com/dl145k.mysql.com authored Sep 23, 2006
  
  bbbb3901
- Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl · b8556c82
  lars/lthalmann@dl145h.mysql.com authored Sep 23, 2006
```
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
```
  b8556c82
- 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 5 commits
- Merge trift2.:/MySQL/M50/mysql-5.0 · 4525ea4b
  joerg@trift2. authored Sep 22, 2006
```
into  trift2.:/MySQL/M51/push-5.1
```
  4525ea4b
- Fix for bug #19121: Windows incompatible udf_example · 67a70100
  georg@lmy002.wdf.sap.corp authored Sep 22, 2006
  
  67a70100
- Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl · 724ea113
  aelkin/elkin@dsl-hkigw8-feb9fb00-191.dhcp.inet.fi authored Sep 22, 2006
```
into  dsl-hkigw8-feb9fb00-191.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/mysql-5.1-new-rpl
```
  724ea113
- BUG#22067 rpl_rbr_to_sbr and some other fail if NDB is default storage · 0c788a30
  aelkin/elkin@dsl-hkigw8-feb9fb00-191.dhcp.inet.fi authored Sep 22, 2006
```
local file slipped into a previous commit, fixing ignore.
```
  0c788a30
- Added build rule for mysql_upgrade.exe · ca00ba49
  georg@lmy002.wdf.sap.corp authored Sep 22, 2006
  
  ca00ba49
21 Sep, 2006 22 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
- Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl · 3b9b6e65
  mats@romeo.(none) authored Sep 21, 2006
```
into  romeo.(none):/home/bkroot/mysql-5.1-new-rpl
```
  3b9b6e65
- BUG#22550 (Replication of BIT column failing): · f5b8614f
  mats@romeo.(none) authored Sep 21, 2006
```
Using move_field_offset() to move field pointer to other record before
calling pack()/unpack().
```
  f5b8614f
- 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
- added udf_example.def for make dist · 8a7875fd
  georg@lmy002.wdf.sap.corp authored Sep 21, 2006
  
  8a7875fd
- Windows 64bit fixes · f4af1d82
  georg@lmy002.wdf.sap.corp authored Sep 21, 2006
```
Fixed udf_example, so tests now can also run udf on win.
```
  f4af1d82
- After merge fixes · 4f5e3b3d
  lars/lthalmann@mysql.com/dl145k.mysql.com authored Sep 21, 2006
  
  4f5e3b3d
- Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge · 2ec23007
  lars/lthalmann@dl145k.mysql.com authored Sep 21, 2006
```
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
```
  2ec23007
- 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
- If mysqlslap schema does not exists, it should be an error, so no need for IF EXISTS · c34601ad
  lars/lthalmann@mysql.com/dl145j.mysql.com authored Sep 21, 2006
```
Setting default database back to 'test', so that next test case don't use the wrong database
```
  c34601ad
- Added master-slave synchronization to make sure truncate happen before slave... · 588ab714
  lars/lthalmann@mysql.com/dl145j.mysql.com authored Sep 21, 2006
```
Added master-slave synchronization to make sure truncate happen before slave manipulations on every platform
```
  588ab714
- 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
- Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · 7f4cd786
  grichter@bk-internal.mysql.com authored Sep 21, 2006
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-win
```
  7f4cd786
- Merge chilla.local:/home/mydev/mysql-5.1--main · 0aaf4837
  istruewing@chilla.local authored Sep 21, 2006
```
into  chilla.local:/home/mydev/mysql-5.1-tomain
```
  0aaf4837
- Deleted old storage directories (introduced by a buggy 5.0 -> 5.1 merge). · b17bbb9d
  georg@lmy002.wdf.sap.corp authored Sep 21, 2006
```
Fix for win/Makefile.am
```
  b17bbb9d
- Vertical printout in test to make easier to read · fe782f92
  lars/lthalmann@mysql.com/dl145h.mysql.com authored Sep 21, 2006
  
  fe782f92
- Version 5.1 needs one connection less · 00ba129e
  lars/lthalmann@mysql.com/dl145j.mysql.com authored Sep 21, 2006
  
  00ba129e
- Result file fixes after merge · bc8207c9
  lars/lthalmann@mysql.com/dl145j.mysql.com authored Sep 21, 2006
  
  bc8207c9
20 Sep, 2006 5 commits
- Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge · a397c180
  lars/lthalmann@dl145j.mysql.com authored Sep 21, 2006
```
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
```
  a397c180
- 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/bk/MERGE/mysql-5.0-merge · 0f85f6f7
  lars/lthalmann@dl145j.mysql.com authored Sep 21, 2006
```
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
```
  0f85f6f7
- Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl · 57a74ea4
  lars/lthalmann@dl145j.mysql.com authored Sep 21, 2006
```
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
```
  57a74ea4