Commit 6d69e120 authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0

parents 7fb87140 fc52abc5

Docs/manual.texi

+4 −4
Original line number Diff line number Diff line
@@ -29135,16 +29135,16 @@ types the precision and scale can be (and usually is) specified; for 
example:















@example













    salary DECIMAL(9,2)













    salary DECIMAL(5,2)















@end example



























In this example, @code{9} (@code{precision}) represents the number of













In this example, @code{5} (@code{precision}) represents the number of















significant decimal digits that will be stored for values, and @code{2}















(@code{scale}) represents the number of digits that will be stored















following the decimal point.  In this case, therefore, the range of















values that can be stored in the @code{salary} column is from













@code{-9999999.99} to @code{9999999.99}.













(MySQL can actually store numbers up to @code{9999999.99} in this column













@code{-99.99} to @code{99.99}.













(MySQL can actually store numbers up to @code{999.99} in this column















because it doesn't have to store the sign for positive numbers)





























In ANSI/ISO SQL92, the syntax @code{DECIMAL(p)} is equivalent to

























myisam/myisamchk.c



+0
−1






























Original line number
Diff line number
Diff line








@@ -21,7 +21,6 @@













#include <m_ctype.h>















#include <stdarg.h>















#include <my_getopt.h>













#include <assert.h>















#ifdef HAVE_SYS_VADVICE_H















#include <sys/vadvise.h>















#endif

































mysys/my_pthread.c



+5
−2






























Original line number
Diff line number
Diff line








@@ -426,7 +426,10 @@ int my_pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,













{















  int error=pthread_cond_timedwait(cond, mutex, abstime);















  if (error == -1)			/* Safety if the lib is fixed */













    error=errno;













  {













    if (!(error=errno))













      error= ETIMEDOUT;			/* Can happen on HPUX */













  }















  if (error == EAGAIN)			/* Correct errno to Posix */















    error= ETIMEDOUT;















  return error;

































mysys/my_thr_init.c



+1
−1






























Original line number
Diff line number
Diff line








@@ -123,7 +123,7 @@ my_bool my_thread_init(void)













#if !defined(__WIN__) || defined(USE_TLS)















  if (my_pthread_getspecific(struct st_my_thread_var *,THR_KEY_mysys))















  {













#ifdef EXTRA_DEBUG













#ifdef EXTRA_DEBUG_THREADS















    fprintf(stderr,"my_thread_init() called more than once in thread %ld\n",















	        pthread_self());















#endif    

































scripts/mysql_fix_privilege_tables.sh



+2
−2






























Original line number
Diff line number
Diff line








@@ -151,7 +151,7 @@ add Create_tmp_table_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Super_priv,













add Lock_tables_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Create_tmp_table_priv,















add Execute_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Lock_tables_priv,















add Repl_slave_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Execute_priv,













add Repl_client_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Repl_slave_priv













add Repl_client_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Repl_slave_priv;















END_OF_DATA































if test $? -eq "0"









@@ -160,7 +160,7 @@ then













  echo ""















  echo "Updating new privileges in MySQL 4.0.2 from old ones"















  @bindir@/mysql --user=root --password="$root_password" --host="$host" mysql <<END_OF_DATA













  update user set show_db_priv= select_priv, super_priv=process_priv, execute_priv=process_priv, create_tmp_table_priv='Y', Lock_tables_priv='Y', Repl_slave_priv=file_priv, Repl_client_priv=file_priv













  update user set show_db_priv= select_priv, super_priv=process_priv, execute_priv=process_priv, create_tmp_table_priv='Y', Lock_tables_priv='Y', Repl_slave_priv=file_priv, Repl_client_priv=file_priv;















END_OF_DATA















  echo ""















fi