diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-09-07 22:38:45 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-09-07 22:38:45 +0300 |
| commit | fd6fea462f60e7e144ec078795016bf7d76ea31f (patch) | |
| tree | 9a8286b6c6ad4333e8815f3b2906b218db6a5635 /sql | |
| parent | 54e33e272d75345b09190052bb0c7d52cce56fc8 (diff) | |
| download | mariadb-git-fd6fea462f60e7e144ec078795016bf7d76ea31f.tar.gz | |
Cleanups
configure.in:
Only allow --with-pstack on Linux x86
mysql-test/t/merge.test:
Add test of using db.tablename in UNION()
mysys/mf_qsort.c:
Fix when using purify
mysys/my_dup.c:
Cleanup
mysys/raid.cc:
Cleanup
sql/gen_lex_hash.cc:
Smaller array
sql/ha_innobase.cc:
Remove warnings
sql/mysqld.cc:
Remove not used option from --help
sql/sql_class.h:
Cleanup
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/gen_lex_hash.cc | 3 | ||||
| -rw-r--r-- | sql/ha_innobase.cc | 12 | ||||
| -rw-r--r-- | sql/mysqld.cc | 1 | ||||
| -rw-r--r-- | sql/sql_class.h | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/sql/gen_lex_hash.cc b/sql/gen_lex_hash.cc index b6621a056a5..36683c0f239 100644 --- a/sql/gen_lex_hash.cc +++ b/sql/gen_lex_hash.cc @@ -472,7 +472,8 @@ int main(int argc,char **argv) int error; MY_INIT(argv[0]); - start_value=3579077L; best_t1=6681742L; best_t2=142815L; best_type=3; /* mode=5167 add=7 type: 0 */ + + start_value=2250933L; best_t1=2721579L; best_t2=4627039L; best_type=3; /* mode=4567 add=4 type: 0 */ if (get_options(argc,(char **) argv)) exit(1); diff --git a/sql/ha_innobase.cc b/sql/ha_innobase.cc index 5287c228637..9db4368bc69 100644 --- a/sql/ha_innobase.cc +++ b/sql/ha_innobase.cc @@ -2704,7 +2704,7 @@ ha_innobase::records_in_range( DBUG_ENTER("records_in_range"); if (prebuilt->trx) { - prebuilt->trx->op_info = "estimating range size"; + prebuilt->trx->op_info = (char*) "estimating range size"; } active_index = keynr; @@ -2740,7 +2740,7 @@ ha_innobase::records_in_range( my_free((char*) key_val_buff2, MYF(0)); if (prebuilt->trx) { - prebuilt->trx->op_info = ""; + prebuilt->trx->op_info = (char*) ""; } DBUG_RETURN((ha_rows) n_rows); @@ -2763,7 +2763,7 @@ ha_innobase::estimate_number_of_rows(void) dict_table_t* ib_table; if (prebuilt->trx) { - prebuilt->trx->op_info = + prebuilt->trx->op_info = (char*) "estimating upper bound of table size"; } @@ -2780,7 +2780,7 @@ ha_innobase::estimate_number_of_rows(void) /* The minimum clustered index record size is 20 bytes */ if (prebuilt->trx) { - prebuilt->trx->op_info = ""; + prebuilt->trx->op_info = (char*) ""; } return((ha_rows) (1000 + data_file_length / 20)); @@ -2822,7 +2822,7 @@ ha_innobase::info( DBUG_ENTER("info"); if (prebuilt->trx) { - prebuilt->trx->op_info = "calculating table stats"; + prebuilt->trx->op_info = (char*) "calculating table stats"; } ib_table = prebuilt->table; @@ -2888,7 +2888,7 @@ ha_innobase::info( } if (prebuilt->trx) { - prebuilt->trx->op_info = ""; + prebuilt->trx->op_info = (char*) ""; } DBUG_VOID_RETURN; diff --git a/sql/mysqld.cc b/sql/mysqld.cc index b228d0e4b15..545ec38de39 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -3202,7 +3202,6 @@ static void usage(void) BACKUP or FORCE.\n\ --memlock Lock mysqld in memory\n\ -n, --new Use very new possible 'unsafe' functions\n\ - --no-mix-table-types Do not use transactional and non-transactional tables in a single query\n -o, --old-protocol Use the old (3.20) protocol\n\ -P, --port=... Port number to use for connection\n"); #ifdef ONE_THREAD diff --git a/sql/sql_class.h b/sql/sql_class.h index a99bce0d6bc..085ea3d7b34 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -614,7 +614,7 @@ public: Unique(qsort_cmp2 comp_func, void * comp_func_fixed_arg, uint size, ulong max_in_memory_size_arg); ~Unique(); - inline bool Unique::unique_add(gptr ptr) + inline bool unique_add(gptr ptr) { if (tree.elements_in_tree > max_elements && flush()) return 1; |