diff options
author | unknown <monty@donna.mysql.com> | 2000-09-07 04:55:17 +0300 |
---|---|---|
committer | unknown <monty@donna.mysql.com> | 2000-09-07 04:55:17 +0300 |
commit | bee9933ab83729e6ca2f2826706b1ab5b985df87 (patch) | |
tree | cd775f59b4803ef23e407df9d47af3ae7b517a13 /sql | |
parent | aaca0e3c6bd71a7b34fcb3a137ab1113a20dca1f (diff) | |
download | mariadb-git-bee9933ab83729e6ca2f2826706b1ab5b985df87.tar.gz |
Small bug fixes
support-files/mysql.server-sys5.sh:
Change mode to -rw-rw-r--
Docs/manual.texi:
Added information about BeOS, Access 2000, AIX and user links
client/mysql.cc:
Fixed SOURCE to work on windows
client/mysqldump.c:
Strip of white space
configure.in:
Fix for AIX
include/dbug.h:
Assert handling
include/my_pthread.h:
Ia64 needs more thread stack than other processors
include/my_sys.h:
More comments
myisam/mi_key.c:
Fixed wrong key length checks
mysql.proj:
update
mysys/charset.c:
Cleanup
mysys/mf_keycache.c:
Moved SEC_LINK to file that used it
mysys/my_static.h:
Moved SEC_LINK to file that used it
scripts/Makefile.am:
Fix for debian
scripts/mysql_install_db.sh:
Cleanup
sql/gen_lex_hash.cc:
Better values
sql/ha_berkeley.cc:
Fix of reading of unique key
sql/handler.cc:
Fix memory allocation bug
sql/mysqld.cc:
Fix for Ia64
sql/share/charsets/latin1.conf:
Fixed sortorder back to scandinavian.
sql/sql_yacc.yy:
FULL shouldn't be a keyword
support-files/Makefile.am:
Fix for debian
support-files/mysql.server.sh:
Cleanups
Diffstat (limited to 'sql')
-rw-r--r-- | sql/gen_lex_hash.cc | 2 | ||||
-rw-r--r-- | sql/ha_berkeley.cc | 2 | ||||
-rw-r--r-- | sql/handler.cc | 7 | ||||
-rw-r--r-- | sql/mysqld.cc | 3 | ||||
-rw-r--r-- | sql/share/charsets/latin1.conf | 8 | ||||
-rw-r--r-- | sql/sql_yacc.yy | 1 |
6 files changed, 14 insertions, 9 deletions
diff --git a/sql/gen_lex_hash.cc b/sql/gen_lex_hash.cc index 436ab228e9e..1ba8c321ae7 100644 --- a/sql/gen_lex_hash.cc +++ b/sql/gen_lex_hash.cc @@ -472,7 +472,7 @@ int main(int argc,char **argv) int error; MY_INIT(argv[0]); - start_value=7223692L; best_t1=2365832L; best_t2=1560117L; best_type=0; /* mode=4519 add=5 func_type: 0 */ + start_value=2610463L; best_t1=8358376L; best_t2=860646L; best_type=2; /* mode=4111 add=8 func_type: 0 */ if (get_options(argc,(char **) argv)) exit(1); diff --git a/sql/ha_berkeley.cc b/sql/ha_berkeley.cc index 652b0045885..f52202a6d70 100644 --- a/sql/ha_berkeley.cc +++ b/sql/ha_berkeley.cc @@ -972,7 +972,7 @@ int ha_berkeley::index_read_idx(byte * buf, uint keynr, const byte * key, statistic_increment(ha_read_key_count,&LOCK_status); DBUG_ENTER("index_read_idx"); current_row.flags=DB_DBT_REALLOC; - DBUG_RETURN(read_row(file->get(file, transaction, + DBUG_RETURN(read_row(file->get(key_file[keynr], transaction, pack_key(&last_key, keynr, key_buff, key, key_len), ¤t_row,0), diff --git a/sql/handler.cc b/sql/handler.cc index 437b11be5bb..17388267fb9 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -317,8 +317,11 @@ int handler::ha_open(const char *name, int mode, int test_if_locked) } if (!error) { - if (!(ref=(byte*) alloc_root(&table->mem_root, - ALIGN_SIZE(ref_length)*2))) + if (!alloc_root_inited(&table->mem_root)) // If temporary table + ref=sql_alloc(ALIGN_SIZE(ref_length)*2); + else + ref=(byte*) alloc_root(&table->mem_root, ALIGN_SIZE(ref_length)*2); + if (!ref) { close(); error=HA_ERR_OUT_OF_MEM; diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 35f484b0e03..596249051fb 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -2302,7 +2302,8 @@ CHANGEABLE_VAR changeable_vars[] = { { "thread_cache_size", (long*) &thread_cache_size, 0,1,16384,0,1}, { "tmp_table_size", (long*) &tmp_table_size,1024*1024L,1024,~0L, MALLOC_OVERHEAD,1}, - { "thread_stack", (long*) &thread_stack,1024*64,1024*32,~0L,0,1024}, + { "thread_stack", (long*) &thread_stack,DEFAULT_THREAD_STACK,1024*32, + ~0L,0,1024}, { "wait_timeout", (long*) &net_wait_timeout,NET_WAIT_TIMEOUT,1,~0L,0,1}, { NullS,(long*) 0,0,0,0,0,0,} }; diff --git a/sql/share/charsets/latin1.conf b/sql/share/charsets/latin1.conf index 515b8812d0f..cf974aefa14 100644 --- a/sql/share/charsets/latin1.conf +++ b/sql/share/charsets/latin1.conf @@ -68,7 +68,7 @@ 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE BF - 41 41 41 41 41 41 C6 43 45 45 45 45 49 49 49 49 - D0 4E 4F 4F 4F 4F 4F D7 4F 55 55 55 55 59 DE 53 - 41 41 41 41 41 41 C6 43 45 45 45 45 49 49 49 49 - D0 4E 4F 4F 4F 4F 4F F7 4F 55 55 55 55 59 DE 59 + 41 41 41 41 5C 5B 5C 43 45 45 45 45 49 49 49 49 + 44 4E 4F 4F 4F 4F 5D D7 D8 55 55 55 59 59 DE DF + 41 41 41 41 5C 5B 5C 43 45 45 45 45 49 49 49 49 + 44 4E 4F 4F 4F 4F 5D F7 D8 55 55 55 59 59 DE FF diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index a79531535c7..37aedda10f0 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -2368,6 +2368,7 @@ keyword: | ESCAPE_SYM {} | EXTENDED_SYM {} | FAST_SYM {} + | FULL {} | FILE_SYM {} | FIRST_SYM {} | FIXED_SYM {} |