Commits · cd7b1fd9eb325f7af88f825cf1f00a15d005645c · nexedi / MariaDB

21 Dec, 2007 4 commits
- Merge janus.mylan:/usr/home/serg/Abk/mysql-5.0 · cd7b1fd9
  unknown authored Dec 21, 2007
```
into  janus.mylan:/usr/home/serg/Abk/mysql-5.1


sql/set_var.cc:
  Auto merged
```
  cd7b1fd9
- cast corrected · f2716fa0
  unknown authored Dec 21, 2007
```
sql/set_var.cc:
  typo :(
```
  f2716fa0
- Merge janus.mylan:/usr/home/serg/Abk/mysql-5.0 · f2953330
  unknown authored Dec 21, 2007
```
into  janus.mylan:/usr/home/serg/Abk/mysql-5.1


sql/set_var.cc:
  Auto merged
```
  f2953330
- warning on windows · 0c16a602
  unknown authored Dec 21, 2007
  
  0c16a602
20 Dec, 2007 5 commits

merged · fd1b1421
unknown authored Dec 21, 2007

fd1b1421

variables.result, variables.test: · 1390bdb8

unknown authored Dec 21, 2007

  test case fixed


mysql-test/r/variables.result:
  test case fixed
mysql-test/t/variables.test:
  test case fixed

1390bdb8

after merge fix in mysqld.cc: · 1548cb67

unknown authored Dec 21, 2007

  added missing status variables (assert works! :)


sql/mysqld.cc:
  added missing status variables (assert works! :)

1548cb67

my_atomic-t.c: · 3e756a80

unknown authored Dec 20, 2007

  gcc bug workaround


unittest/mysys/my_atomic-t.c:
  gcc bug workaround

3e756a80

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 295732b5

unknown authored Dec 20, 2007

into  janus.mylan:/usr/home/serg/Abk/mysql-5.1


configure.in:
  Auto merged
libmysql/CMakeLists.txt:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/field.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_geofunc.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/key.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/protocol.h:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
storage/archive/ha_archive.cc:
  Auto merged
storage/innobase/buf/buf0buf.c:
  Auto merged
storage/innobase/buf/buf0flu.c:
  Auto merged
storage/innobase/buf/buf0lru.c:
  Auto merged
storage/innobase/include/buf0buf.h:
  Auto merged
storage/innobase/include/buf0buf.ic:
  Auto merged
storage/innobase/include/sync0arr.h:
  Auto merged
storage/innobase/include/sync0rw.h:
  Auto merged
storage/innobase/include/sync0rw.ic:
  Auto merged
storage/innobase/include/sync0sync.h:
  Auto merged
storage/innobase/os/os0sync.c:
  Auto merged
storage/innobase/sync/sync0arr.c:
  Auto merged
storage/innobase/sync/sync0rw.c:
  Auto merged
storage/innobase/sync/sync0sync.c:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
storage/myisam/mi_open.c:
  Auto merged
storage/myisammrg/ha_myisammrg.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  merged
sql/item_cmpfunc.cc:
  merged
sql/protocol.cc:
  merged
sql/slave.cc:
  merged
sql/sql_class.h:
  merged
sql/sql_parse.cc:
  merged

295732b5

19 Dec, 2007 7 commits

Merge janus.mylan:/usr/home/serg/Abk/mysql-5.0 · 9bf48856

unknown authored Dec 19, 2007

into  janus.mylan:/usr/home/serg/Abk/mysql-5.1


mysql-test/mysql-test-run.pl:
  Auto merged
storage/innobase/buf/buf0buf.c:
  Auto merged
storage/innobase/buf/buf0flu.c:
  Auto merged
storage/innobase/buf/buf0lru.c:
  Auto merged
storage/innobase/include/buf0buf.h:
  Auto merged
storage/innobase/include/buf0buf.ic:
  Auto merged
storage/innobase/include/sync0arr.h:
  Auto merged
storage/innobase/include/sync0rw.h:
  Auto merged
storage/innobase/include/sync0rw.ic:
  Auto merged
storage/innobase/include/sync0sync.h:
  Auto merged
storage/innobase/os/os0sync.c:
  Auto merged
storage/innobase/sync/sync0arr.c:
  Auto merged
storage/innobase/sync/sync0rw.c:
  Auto merged
storage/innobase/sync/sync0sync.c:
  Auto merged

9bf48856

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 172a33be
unknown authored Dec 19, 2007
```
into  janus.mylan:/usr/home/serg/Abk/mysql-5.0
```
172a33be

Merge janus.mylan:/usr/home/serg/Abk/mysql-5.0 · 82aee4ef

unknown authored Dec 19, 2007

into  janus.mylan:/usr/home/serg/Abk/mysql-5.1


mysql-test/r/variables.result:
  Auto merged
sql/set_var.cc:
  Auto merged
mysql-test/t/variables.test:
  merged

82aee4ef

correct invalid values in SET GLOBAL var=DEFAULT · 154933ec

unknown authored Dec 19, 2007

bug#33382


mysql-test/r/variables.result:
  typo in a test case
mysql-test/t/variables.test:
  typo in a test case
sql/set_var.cc:
  correct invalid values in SET GLOBAL var=DEFAULT

154933ec

SHOW_VAR arrays are null-terminated :-[] · 25fa7692
unknown authored Dec 19, 2007

25fa7692

Followup for bug#30252. · 604b3982

unknown authored Dec 19, 2007

Ensure that all SQLCOM_ constants have corresponding Com_ variables.


mysql-test/r/status.result:
  Tests updated.
sql/mysqld.cc:
  Followup for bug#30252.
  Rename few variables to match SQL syntax.
  Ensure that all SQLCOM_ constants have corresponding Com_ variables.

604b3982

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · 881b405d
unknown authored Dec 19, 2007
```
into  janus.mylan:/usr/home/serg/Abk/mysql-5.1
```
881b405d

18 Dec, 2007 4 commits

Sort class handler public declarations. · 554599e8

unknown authored Dec 19, 2007


sql/handler.h:
  Collect ha_* wrappers and their virtual counterparts into two
  symmetrical groups. Previously they were scattered all over class
  handler declaration. That should ease maintenance and addition
  of new ha_ wrappers.
  When a new ha_* wrapper is added, it should be added to the
  end of the ha_* group. Its virtual counterpart should become private
  and be moved to the end of the hander class.

554599e8

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · cd7cfc2a
unknown authored Dec 18, 2007
```
into  janus.mylan:/usr/home/serg/Abk/mysql-5.1
```
cd7cfc2a
Merge damien-katzs-computer.local:/Users/dkatz/mysql-5.1-runtime · fba0a6db
unknown authored Dec 18, 2007
```
into  damien-katzs-computer.local:/Users/dkatz/Com_create_function


sql/mysqld.cc:
  Auto merged
```
fba0a6db
Consistently use doxygen comments in class handler. · a7405ca4
unknown authored Dec 18, 2007

a7405ca4

17 Dec, 2007 2 commits

Order results to be deterministic. · 3ab83a2e

unknown authored Dec 17, 2007

Follow SergG's lead with mysqlcheck result.


mysql-test/r/mysqlcheck.result:
  Error changed lately.  This may not be a bug, despite Bug#29458.
  
  See SergG [22 Nov 11:45] comment for Bug#25347.
mysql-test/suite/rpl/r/rpl_invoked_features.result:
  Order so it is deterministic.
mysql-test/suite/rpl/t/rpl_invoked_features.test:
  Order so it is deterministic.

3ab83a2e

Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 99a5f6e9

unknown authored Dec 17, 2007

into  janus.mylan:/usr/home/serg/Abk/mysql-5.1


mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/table.cc:
  Auto merged

99a5f6e9

15 Dec, 2007 5 commits

Try to fix assertion failures at slave shutdown when running · 7213ca20

unknown authored Dec 15, 2007

rpl_ndb tests on sapsrv1.


sql/ha_ndbcluster_binlog.cc:
  Try to fix assertion failures at slave shutdown when running
  rpl_ndb tests. If the binlog thread is killed, which happens during
  shutdown, open_tables returns error without setting an error
  in THD. Therefore one can't access thd->main_da.message() if thd->killed.

7213ca20

Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime · b8671579
unknown authored Dec 15, 2007
```
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
```
b8671579
Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 81dda2e7
unknown authored Dec 15, 2007
```
into  bodhi.(none):/opt/local/work/mysql-5.0-runtime
```
81dda2e7

Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · cb48c979

unknown authored Dec 15, 2007

into  bodhi.(none):/opt/local/work/mysql-5.1-runtime


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged

cb48c979

WL#4165 (Prepared statements: validation) · 0a578711

unknown authored Dec 14, 2007

Adding the tests cases alone for WL#4165, disabled


mysql-test/t/disabled.def:
  WL#4165 (Prepared statements: validation)
mysql-test/r/ps_ddl.result:
  WL#4165 (Prepared statements: validation)
mysql-test/t/ps_ddl.test:
  WL#4165 (Prepared statements: validation)

0a578711

14 Dec, 2007 13 commits

Bug #30252 Com_create_function is not incremented. · 66775279

unknown authored Dec 14, 2007

Added Com_create_spfunction and all other commands previously missing to the global status variables.

66775279

Recorded silly ephemeral test. · 29418ca8
unknown authored Dec 14, 2007

29418ca8

Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · ae412cdb

unknown authored Dec 14, 2007

into  janus.mylan:/usr/home/serg/Abk/mysql-5.1


client/mysqldump.c:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/suite/rpl/include/rpl_mixed_dml.inc:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/handler.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged

ae412cdb

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-forcollapseandmerge · 7fd0ad21

unknown authored Dec 14, 2007

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


CMakeLists.txt:
  Auto merged
configure.in:
  Auto merged
libmysql/CMakeLists.txt:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/r/information_schema_db.result:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
sql/CMakeLists.txt:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/structs.h:
  Auto merged
sql/table.h:
  Auto merged
storage/archive/ha_archive.cc:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
storage/myisam/mi_open.c:
  Auto merged
storage/myisammrg/ha_myisammrg.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
client/mysqlcheck.c:
  Manual merge.
mysql-test/r/information_schema.result:
  Manual merge.
mysql-test/r/mysqlcheck.result:
  Manual merge.
mysql-test/t/mysqlcheck.test:
  Manual merge.
sql/slave.cc:
  Manual merge.
sql/sql_base.cc:
  Manual merge.
sql/sql_delete.cc:
  Manual merge.
sql/sql_parse.cc:
  Manual merge.
sql/sql_update.cc:
  Manual merge.

7fd0ad21

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 · cfd4951d
unknown authored Dec 14, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
```
cfd4951d
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0 · 3c1b039d
unknown authored Dec 14, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1


configure.in:
  null merge
```
3c1b039d
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0 · 6a1046f6
unknown authored Dec 14, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
```
6a1046f6
Raise version number after cloning 5.0.54 · bb9950a8
unknown authored Dec 14, 2007

bb9950a8

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 18f5e87e

unknown authored Dec 14, 2007

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


sql/field.cc:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_geofunc.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/protocol.h:
  Auto merged
sql/records.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/structs.h:
  Auto merged
sql/unireg.h:
  Auto merged
sql/item.cc:
  manual merge
sql/log_event.cc:
  manual merge
sql/protocol.cc:
  manual merge
sql/sp_head.cc:
  manual merge
sql/sql_base.cc:
  manual merge
sql/sql_parse.cc:
  manual merge
sql/sql_select.cc:
  manual merge

18f5e87e

Add profiling support for embedded server. · 72d97dfd
unknown authored Dec 14, 2007
```
libmysqld/lib_sql.cc:
  Start and finish profiling for a query in an embedded server.
```
72d97dfd

Correct complaints of reviewers and clean up test. · f8ccbcc4

unknown authored Dec 14, 2007


mysql-test/r/profiling.result:
  Remove unnecessary verbosity.
  
  Remove section of test that is impossible to test with PS protocol.
mysql-test/t/profiling.test:
  Remove unnecessary verbosity.
  
  Remove section of test that is impossible to test with PS protocol.
sql/sql_profile.h:
  Make bit flags unsigned ints.

f8ccbcc4

Merge station.:/mnt/raid/alik/MySQL/devel/5.0-rt · 4d3cd0d7
unknown authored Dec 14, 2007
```
into  station.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged-5.0-rt
```
4d3cd0d7

Merge station.:/mnt/raid/alik/MySQL/devel/5.1 · 541ac204

unknown authored Dec 14, 2007

into  station.:/mnt/raid/alik/MySQL/devel/5.1-rt


client/mysqltest.c:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysqld/emb_qcache.cc:
  Auto merged
libmysqld/emb_qcache.h:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/table.cc:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
sql/protocol.cc:
  SCCS merged

541ac204