database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge main 5.1 into 5.1-build

Browse Source
This commit is contained in:
Joerg Bruehe
2009-08-13 22:25:58 +02:00
parent b50f05e67a 09d042249a
commit c143b41698
5 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.bzrignore
View File

@ -3063,3 +3063,4 @@ sql/share/slovak
sql/share/spanish sql/share/spanish
sql/share/swedish sql/share/swedish
sql/share/ukrainian sql/share/ukrainian
libmysqld/examples/mysqltest.cc

2
configure.in
View File

@ -10,7 +10,7 @@ AC_CANONICAL_SYSTEM
# #
# When changing major version number please also check switch statement # When changing major version number please also check switch statement
# in mysqlbinlog::check_master_version(). # in mysqlbinlog::check_master_version().
AM_INIT_AUTOMAKE(mysql, 5.1.38) AM_INIT_AUTOMAKE(mysql, 5.1.39)
AM_CONFIG_HEADER([include/config.h:config.h.in]) AM_CONFIG_HEADER([include/config.h:config.h.in])
PROTOCOL_VERSION=10 PROTOCOL_VERSION=10

1
mysql-test/lib/mtr_cases.pm
View File

@ -494,6 +494,7 @@ sub collect_one_suite($)
next if ($test->{'skip'} || !$test->{'innodb_test'}); next if ($test->{'skip'} || !$test->{'innodb_test'});
# Exceptions # Exceptions
next if ($test->{'name'} eq 'main.innodb'); # Failed with wrong errno (fk) next if ($test->{'name'} eq 'main.innodb'); # Failed with wrong errno (fk)
next if ($test->{'name'} eq 'main.index_merge_innodb'); # Explain diff
# innodb_file_per_table is rw with innodb_plugin # innodb_file_per_table is rw with innodb_plugin
next if ($test->{'name'} eq 'sys_vars.innodb_file_per_table_basic'); next if ($test->{'name'} eq 'sys_vars.innodb_file_per_table_basic');
# innodb_lock_wait_timeout is rw with innodb_plugin # innodb_lock_wait_timeout is rw with innodb_plugin

2
storage/innodb_plugin/include/btr0cur.h
View File

@ -618,7 +618,7 @@ enum btr_cur_method {
hash_node, and might be necessary to hash_node, and might be necessary to
update */ update */
BTR_CUR_BINARY, /*!< success using the binary search */ BTR_CUR_BINARY, /*!< success using the binary search */
BTR_CUR_INSERT_TO_IBUF, /*!< performed the intended insert to BTR_CUR_INSERT_TO_IBUF /*!< performed the intended insert to
the insert buffer */ the insert buffer */
}; };

2
storage/innodb_plugin/include/trx0types.h
View File

@ -70,7 +70,7 @@ typedef struct trx_named_savept_struct trx_named_savept_t;
enum trx_rb_ctx { enum trx_rb_ctx {
RB_NONE = 0, /*!< no rollback */ RB_NONE = 0, /*!< no rollback */
RB_NORMAL, /*!< normal rollback */ RB_NORMAL, /*!< normal rollback */
RB_RECOVERY, /*!< rolling back an incomplete transaction, RB_RECOVERY /*!< rolling back an incomplete transaction,
in crash recovery */ in crash recovery */
}; };