← Back to branch summary

~maria-captains/maria/xtradb-mergetree-5.5

« back to all changes in this revision

Viewing changes to handler/ha_innodb.cc

  • Committer: Sergei Golubchik
  • Date: 2014-06-02 21:25:54 UTC
  • Revision ID: sergii@pisem.net-20140602212554-j41oo0cyjr3xiuei
percona-server-5.5.37-35.0.tar.gz

Show diffs side-by-side

added added

removed removed

Lines of Context:
handler/ha_innodb.cc
1
1
/*****************************************************************************
2
2
 
3
 
Copyright (c) 2000, 2013, Oracle and/or its affiliates. All Rights Reserved.
 
3
Copyright (c) 2000, 2014, Oracle and/or its affiliates. All Rights Reserved.
4
4
Copyright (c) 2008, 2009 Google Inc.
5
5
Copyright (c) 2009, Percona Inc.
6
6
 
2936
2936
                internal_innobase_data_file_path);
2937
2937
        if (ret == FALSE) {
2938
2938
                sql_print_error(
2939
 
                        "InnoDB: syntax error in innodb_data_file_path");
 
2939
                        "InnoDB: syntax error in innodb_data_file_path"
 
2940
                        " or size specified is less than 1 megabyte");
2940
2941
mem_free_and_error:
2941
2942
                srv_free_paths_and_sizes();
2942
2943
                my_free(internal_innobase_data_file_path);
11329
11330
 
11330
11331
                current = *first_value > col_max_value ? autoinc : *first_value;
11331
11332
 
 
11333
                /* If the increment step of the auto increment column
 
11334
                decreases then it is not affecting the immediate
 
11335
                next value in the series. */
 
11336
                if (prebuilt->autoinc_increment > increment) {
 
11337
 
 
11338
                        current = autoinc - prebuilt->autoinc_increment;
 
11339
 
 
11340
                        current = innobase_next_autoinc(
 
11341
                                current, 1, increment, 1, col_max_value);
 
11342
 
 
11343
                        dict_table_autoinc_initialize(prebuilt->table, current);
 
11344
 
 
11345
                        *first_value = current;
 
11346
                }
 
11347
 
11332
11348
                /* Compute the last value in the interval */
11333
11349
                next_value = innobase_next_autoinc(
11334
11350
                        current, *nb_reserved_values, increment, offset,
13070
13086
static MYSQL_SYSVAR_ULONG(thread_sleep_delay, srv_thread_sleep_delay,
13071
13087
  PLUGIN_VAR_RQCMDARG,
13072
13088
  "Time of innodb thread sleeping before joining InnoDB queue (usec). Value 0 disable a sleep",
13073
 
  NULL, NULL, 10000L, 0L, ~0UL, 0);
 
13089
  NULL, NULL, 10000L, 0L, 1000000L, 0);
13074
13090
 
13075
13091
static MYSQL_SYSVAR_STR(data_file_path, innobase_data_file_path,
13076
13092
  PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,