Commits · 84ceb01eb63f7e344bbf0ae5d37542b74234d960 · nexedi / MariaDB

09 Mar, 2007 7 commits

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


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


sql/sql_select.cc:
  Auto merged
```
76542acd

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

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

0b85b793

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

aftermerge fix · 32ed7ddc

unknown authored Mar 09, 2007


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

32ed7ddc

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

08 Mar, 2007 33 commits

Merge bk@192.168.21.1:mysql-5.1 · 3d52be15

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

3d52be15

Merge bk@192.168.21.1:mysql-5.0 · 12af6585

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

12af6585

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

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)

f68891f8

Merge bk@192.168.21.1:mysql-4.1 · 0fcd9c2b
unknown authored Mar 08, 2007
```
into  mysql.com:/home/hf/work/mrg/mysql-4.1-opt
```
0fcd9c2b
merging · 012ae635
unknown authored Mar 08, 2007

012ae635
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · ceefecb2
unknown authored Mar 08, 2007
```
into  bk-internal.mysql.com:/data0/bk/tsmith-tmp/mysql-5.2


configure.in:
  Auto merged
```
ceefecb2

sql_select.cc: · 4c0ab891

unknown authored Mar 08, 2007

  Postfix for bug#22331.


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

4c0ab891

Update result for 5.1 · 0381f8cf
unknown authored Mar 08, 2007

0381f8cf

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

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

52ce1b73

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

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

unknown authored Mar 08, 2007

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


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

b4a38b9e

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

unknown authored Mar 08, 2007

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


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

d6bd171f

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

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

eded6783

Fix 6 warnings from win64, where one is a potential bug. · 10ddaa78

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.

10ddaa78

Merge bk-internal:/home/bk/mysql-5.1-new-maint · 90f02ac8

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

90f02ac8

Merge bk-internal:/home/bk/mysql-5.0-maint · cc379fff

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

cc379fff

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


extra/comp_err.c:
  Auto merged
```
3471a8b6

comp_err.c: return ha_checksum from checksum_format_specifier() - more... · 0a5780bc

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

0a5780bc

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

ef56d39b

Merge mysql.com:/data0/mysqldev/users/tomas/mysql-5.0-maint · 5948063b

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

5948063b

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

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

b45970db

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

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

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

e911ded7

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 5e85ba7d

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

5e85ba7d

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

Merge poseidon.mysql.com:/home/tomas/mysql-5.1 · 57097f69

unknown authored Mar 08, 2007

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


sql/ha_ndbcluster.cc:
  Auto merged

57097f69

Merge poseidon.mysql.com:/home/tomas/mysql-5.0 · 02fa7a16
unknown authored Mar 08, 2007
```
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
```
02fa7a16
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 1d07e346
unknown authored Mar 08, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/50
```
1d07e346
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/misc/51-fedfix · 93d87872
unknown authored Mar 08, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage1/51
```
93d87872

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

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

b818a501

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

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

441cae69

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/41 · 270f20ae
unknown authored Mar 08, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/50
```
270f20ae
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/40 · f2044997
unknown authored Mar 08, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/41
```
f2044997