← Back to branch summary

~mysql/mysql-server/mysql-6.0

~mysql/mysql-server/mysql-6.0

Viewing all changes in revision 1354.99.1.

Committer: monty at mysql
Date: 2002-12-05 17:38:42 UTC
mfrom: (1346.7.103)
mto: (1388.1.1)
mto: This revision was merged to the branch mainline in revision 1390.
Revision ID: sp1r-monty@mashka.mysql.fi-20021205173842-56440

Merge with 4.0.6

files removed:
client/errmsg.c

files modified:
.bzrignore

BUILD/compile-solaris-sparc

BUILD/compile-solaris-sparc-purify

BitKeeper/triggers/post-commit

acinclude.m4

heap/_check.c

heap/hp_delete.c

heap/hp_scan.c

heap/hp_update.c

heap/hp_write.c

include/errmsg.h

include/my_base.h

innobase/row/row0sel.c

isam/extra.c

libmysql/errmsg.c

libmysql/libmysql.c

libmysqld/lib_sql.cc

myisam/mi_check.c

myisam/mi_extra.c

myisam/mi_rnext_same.c

myisam/sort.c

myisammrg/myrg_extra.c

mysql-test/mysql-test-run.sh

mysql-test/r/alter_table.result

mysql-test/r/distinct.result

mysql-test/r/func_math.result

mysql-test/r/group_by.result

mysql-test/r/innodb.result

mysql-test/r/multi_update.result

mysql-test/r/null.result

mysql-test/r/select.result

mysql-test/r/temp_table.result

mysql-test/r/type_timestamp.result

mysql-test/t/alter_table.test

mysql-test/t/distinct.test

mysql-test/t/func_math.test

mysql-test/t/group_by.test

mysql-test/t/innodb.test

mysql-test/t/multi_update.test

mysql-test/t/null.test

mysql-test/t/select.test

mysql-test/t/temp_table.test

mysql-test/t/type_timestamp.test

mysys/mf_iocache.c

sql-bench/crash-me.sh

sql-bench/server-cfg.sh

sql/field.cc

sql/field.h

sql/field_conv.cc

sql/ha_innodb.cc

sql/handler.cc

sql/item.cc

sql/item.h

sql/item_cmpfunc.cc

sql/item_cmpfunc.h

sql/item_func.cc

sql/item_func.h

sql/item_timefunc.cc

sql/item_timefunc.h

sql/log.cc

sql/mysql_priv.h

sql/mysqld.cc

sql/opt_range.cc

sql/password.c

sql/set_var.cc

sql/set_var.h

sql/sql_base.cc

sql/sql_class.cc

sql/sql_class.h

sql/sql_delete.cc

sql/sql_handler.cc

sql/sql_insert.cc

sql/sql_olap.cc

sql/sql_parse.cc

sql/sql_select.cc

sql/sql_select.h

sql/sql_table.cc

sql/sql_udf.cc

sql/sql_union.cc

sql/sql_update.cc

sql/sql_yacc.yy

sql/table.h

sql/unireg.cc

strings/strto.c

support-files/make_mysql_pkg.pl

support-files/mysql.server.sh

vio/vio.c

Show diffs side-by-side

added added

removed removed

BUILD/compile-solaris-sparc

BUILD/compile-solaris-sparc-purify

BitKeeper/triggers/post-commit

client/errmsg.c

heap/hp_delete.c

heap/hp_update.c

heap/hp_write.c

include/errmsg.h

include/my_base.h

innobase/row/row0sel.c

libmysql/errmsg.c

libmysql/libmysql.c

libmysqld/lib_sql.cc

myisam/mi_check.c

myisam/mi_extra.c

myisam/mi_rnext_same.c

myisammrg/myrg_extra.c

mysql-test/mysql-test-run.sh

mysql-test/r/alter_table.result

mysql-test/r/distinct.result

mysql-test/r/func_math.result

mysql-test/r/group_by.result

mysql-test/r/innodb.result

mysql-test/r/multi_update.result

mysql-test/r/null.result

mysql-test/r/select.result

mysql-test/r/temp_table.result

mysql-test/r/type_timestamp.result

mysql-test/t/alter_table.test

mysql-test/t/distinct.test

mysql-test/t/func_math.test

mysql-test/t/group_by.test

mysql-test/t/innodb.test

mysql-test/t/multi_update.test

mysql-test/t/null.test

mysql-test/t/select.test

mysql-test/t/temp_table.test

mysql-test/t/type_timestamp.test

mysys/mf_iocache.c

sql-bench/crash-me.sh

sql-bench/server-cfg.sh

sql/field_conv.cc

sql/ha_innodb.cc

sql/item_cmpfunc.cc

sql/item_cmpfunc.h

sql/item_func.cc

sql/item_func.h

sql/item_timefunc.cc

sql/item_timefunc.h

sql/mysql_priv.h

sql/opt_range.cc

sql/sql_base.cc

sql/sql_class.cc

sql/sql_class.h

sql/sql_delete.cc

sql/sql_handler.cc

sql/sql_insert.cc

sql/sql_olap.cc

sql/sql_parse.cc

sql/sql_select.cc

sql/sql_select.h

sql/sql_table.cc

sql/sql_union.cc

sql/sql_update.cc

sql/sql_yacc.yy

strings/strto.c

support-files/make_mysql_pkg.pl

support-files/mysql.server.sh

Older »