Commits · 95342119fb05ad1f989d228e3ac4e905d48e1fe3 · nexedi / MariaDB

09 Mar, 2007 8 commits

Merge bk@192.168.21.1:mysql-5.1 · 95342119
unknown authored Mar 09, 2007
```
into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
```
95342119
Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt · a0260258
unknown authored Mar 09, 2007
```
into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt


sql/sql_select.cc:
  Auto merged
```
a0260258
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 5fbc4d9d
unknown authored Mar 09, 2007
```
into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt


sql/sql_select.cc:
  Auto merged
```
5fbc4d9d

Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt · e7836808

unknown authored Mar 09, 2007

into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt


mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/order_by.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/order_by.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
mysql-test/r/sp.result:
  merging
mysql-test/r/view.result:
  merging
mysql-test/t/func_str.test:
  merging
mysql-test/t/view.test:
  merging

e7836808

Merge mysql.com:/home/hf/work/mrg/mysql-4.1-opt · e504208f
unknown authored Mar 09, 2007
```
into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt
```
e504208f

aftermerge fix · c5082ada

unknown authored Mar 09, 2007


mysql-test/r/sp.result:
  merging
mysql-test/r/view.result:
  merging

c5082ada

aftermerge fix · 7ce5a98e
unknown authored Mar 09, 2007
```
mysql-test/r/view.result:
  merging
```
7ce5a98e
Merge mysql.com:/home/hf/work/mysql-5.1 · bfc7c0cf
unknown authored Mar 09, 2007
```
into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
```
bfc7c0cf

08 Mar, 2007 32 commits

rpl_ssl.result, rpl_ssl.test: · 2c7d2e1f

unknown authored Mar 08, 2007

  Mask out *_Master_Log_Pos in rpl_ssl test; it varies depending on binlog format


mysql-test/t/rpl_ssl.test:
  Mask out *_Master_Log_Pos in rpl_ssl test; it varies depending on binlog format
mysql-test/r/rpl_ssl.result:
  Mask out *_Master_Log_Pos in rpl_ssl test; it varies depending on binlog format

2c7d2e1f

Merge bk@192.168.21.1:mysql-5.1 · 7e2327e8

unknown authored Mar 08, 2007

into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt


mysql-test/r/order_by.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/order_by.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
mysql-test/r/func_str.result:
  merging
mysql-test/r/sp.result:
  merging
mysql-test/r/view.result:
  merging
mysql-test/t/func_str.test:
  merging
mysql-test/t/view.test:
  merging

7e2327e8

Merge bk@192.168.21.1:mysql-5.0 · 6f5f2551

unknown authored Mar 08, 2007

into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt


mysql-test/r/order_by.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/order_by.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
mysql-test/r/func_str.result:
  merging
mysql-test/r/sp.result:
  merging
mysql-test/r/view.result:
  merging
mysql-test/t/func_str.test:
  merging
mysql-test/t/view.test:
  merging

6f5f2551

The most recent push into mysql-5.1 from mysql-5.2 was a mistake. · 9d50fd61

unknown authored Mar 08, 2007

This just reverses those changes.  I'm really sorry about that.

configure.in, version.c:
  Reverse last push (from mysql-5.2 into mysql-5.1)


configure.in:
  Reverse last push (from mysql-5.2 into mysql-5.1)
storage/ndb/src/common/util/version.c:
  Reverse last push (from mysql-5.2 into mysql-5.1)

9d50fd61

Merge bk@192.168.21.1:mysql-4.1 · 421ebc9c
unknown authored Mar 08, 2007
```
into  mysql.com:/home/hf/work/mrg/mysql-4.1-opt
```
421ebc9c
merging · 617694dd
unknown authored Mar 08, 2007

617694dd
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · f5251211
unknown authored Mar 08, 2007
```
into  bk-internal.mysql.com:/data0/bk/tsmith-tmp/mysql-5.2


configure.in:
  Auto merged
```
f5251211

sql_select.cc: · 47c82810

unknown authored Mar 08, 2007

  Postfix for bug#22331.


sql/sql_select.cc:
  Postfix for bug#22331.

47c82810

Update result for 5.1 · 60633dc5
unknown authored Mar 08, 2007

60633dc5

Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt · 85b60df6

unknown authored Mar 08, 2007

into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt


BUILD/check-cpu:
  Auto merged
mysql-test/r/explain.result:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/func_test.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/update.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/explain.test:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_update.cc:
  Auto merged
mysql-test/r/func_in.result:
  SCCS merged
mysql-test/r/order_by.result:
  SCCS merged
mysql-test/r/sp.result:
  merging
mysql-test/t/func_in.test:
  SCCS merged
mysql-test/t/order_by.test:
  SCCS merged
mysql-test/t/view.test:
  merging
sql/item_cmpfunc.h:
  merging
sql/mysql_priv.h:
  merging
sql/sql_select.cc:
  SCCS merged

85b60df6

Merge bk-internal:/home/bk/mysql-4.1-maint · ff39c451
unknown authored Mar 08, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
```
ff39c451

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 3c5d39ad

unknown authored Mar 08, 2007

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged

3c5d39ad

Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · aa0aa0c9

unknown authored Mar 08, 2007

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Manual merge

aa0aa0c9

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 54bd7e30

unknown authored Mar 08, 2007

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


client/mysql.cc:
  Auto merged
extra/comp_err.c:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
BUILD/SETUP.sh:
  Use local

54bd7e30

Fix 6 warnings from win64, where one is a potential bug. · 890c6fa1

unknown authored Mar 08, 2007


sql/event_data_objects.cc:
  Passing time as time_t to function my_time_t requires
  cast to my_time_t since my_time_t are only required to be 32bits.
sql/log.cc:
  Using time_t instead of my_time_t when calculating current_time.
  This is a potential bugfix for problem with mysql_system_db reporting
  slow log as crashed.
sql/sql_show.cc:
  Passing time as time_t to function my_time_t requires
  cast to my_time_t since my_time_t are only required to be 32bits.

890c6fa1

Merge bk-internal:/home/bk/mysql-5.1-new-maint · 7ee5bfb9

unknown authored Mar 08, 2007

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged

7ee5bfb9

Merge bk-internal:/home/bk/mysql-5.0-maint · 5825c7bb

unknown authored Mar 08, 2007

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


extra/comp_err.c:
  Auto merged
sql/mysqld.cc:
  Auto merged

5825c7bb

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 · e9b57e88
unknown authored Mar 08, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51


extra/comp_err.c:
  Auto merged
```
e9b57e88

comp_err.c: return ha_checksum from checksum_format_specifier() - more... · 5c04edd5

unknown authored Mar 08, 2007

comp_err.c: return ha_checksum from checksum_format_specifier() - more correct, avoid a compiler warning

extra/comp_err.c:
return ha_checksum from checksum_format_specifier() - more correct, avoid a compiler warning

5c04edd5

Fix bad merge of mysql_upgrade.c; return to version 1.27 of the file, as after fix for bug 25074 · 54c580e4
unknown authored Mar 08, 2007

54c580e4

Merge mysql.com:/data0/mysqldev/users/tomas/mysql-5.0-maint · 6f1b4bab

unknown authored Mar 08, 2007

into  mysql.com:/data0/mysqldev/users/tomas/mysql-5.1-new-maint


storage/ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged

6f1b4bab

Merge bk-internal:/home/bk/mysql-5.1-new-ndb · 322397ff

unknown authored Mar 08, 2007

into  mysql.com:/data0/mysqldev/users/tomas/mysql-5.1-new-maint


client/sql_string.h:
  Auto merged
storage/myisam/mi_open.c:
  Auto merged
storage/ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged

322397ff

Merge bk-internal:/home/bk/mysql-5.0-ndb · 50ca03f6
unknown authored Mar 08, 2007
```
into  mysql.com:/data0/mysqldev/users/tomas/mysql-5.0-maint
```
50ca03f6

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/50 · a3e4bdee

unknown authored Mar 08, 2007

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/51


scripts/make_binary_distribution.sh:
  Auto merged

a3e4bdee

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 2206f88a

unknown authored Mar 08, 2007

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/51


scripts/make_binary_distribution.sh:
  Auto merged

2206f88a

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 69517175
unknown authored Mar 08, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/51
```
69517175

Merge poseidon.mysql.com:/home/tomas/mysql-5.1 · 84ca8500

unknown authored Mar 08, 2007

into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged

84ca8500

Merge poseidon.mysql.com:/home/tomas/mysql-5.0 · 8a1125dd
unknown authored Mar 08, 2007
```
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
```
8a1125dd
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 1b340658
unknown authored Mar 08, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/50
```
1b340658
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/misc/51-fedfix · 7b4ad5e0
unknown authored Mar 08, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage1/51
```
7b4ad5e0

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage1/50 · ce408912

unknown authored Mar 08, 2007

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage1/51


sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged

ce408912

Bug #26940: CREATE SERVER does not initialize record[0] in insert_server_record() · 4fac5aef

unknown authored Mar 08, 2007

sql_servers.cc:insert_server_record(): initialize record[0] before inserting row

sql/sql_servers.cc:
sql_servers.cc:insert_server_record(): initialize record[0] before inserting row

4fac5aef