Commit graph

11285 commits

Author SHA1 Message Date
unknown
afedd9f8f7 Task #835: additional changes fot str_to_date
include/mysqld_error.h:
  Task #835: additional changes fot str_to_date
  New error message
mysql-test/r/date_formats.result:
  Task #835: additional changes fot str_to_date
  tests
mysql-test/r/func_sapdb.result:
  Task #835: additional changes fot str_to_date
  tests
mysql-test/r/func_time.result:
  Task #835: additional changes fot str_to_date
  tests
mysql-test/r/type_time.result:
  Task #835: additional changes fot str_to_date
  tests
mysql-test/t/date_formats.test:
  Task #835: additional changes fot str_to_date
  tests
mysql-test/t/func_sapdb.test:
  Task #835: additional changes fot str_to_date
  tests
mysql-test/t/func_time.test:
  Task #835: additional changes fot str_to_date
  tests
sql/share/czech/errmsg.txt:
  Task #835: additional changes fot str_to_date
  New error message
sql/share/danish/errmsg.txt:
  Task #835: additional changes fot str_to_date
  New error message
sql/share/dutch/errmsg.txt:
  Task #835: additional changes fot str_to_date
  New error message
sql/share/english/errmsg.txt:
  Task #835: additional changes fot str_to_date
  New error message
sql/share/estonian/errmsg.txt:
  Task #835: additional changes fot str_to_date
  New error message
sql/share/french/errmsg.txt:
  Task #835: additional changes fot str_to_date
  New error message
sql/share/german/errmsg.txt:
  Task #835: additional changes fot str_to_date
  New error message
sql/share/greek/errmsg.txt:
  Task #835: additional changes fot str_to_date
  New error message
sql/share/hungarian/errmsg.txt:
  Task #835: additional changes fot str_to_date
  New error message
sql/share/italian/errmsg.txt:
  Task #835: additional changes fot str_to_date
  New error message
sql/share/japanese/errmsg.txt:
  Task #835: additional changes fot str_to_date
  New error message
sql/share/korean/errmsg.txt:
  Task #835: additional changes fot str_to_date
  New error message
sql/share/norwegian-ny/errmsg.txt:
  Task #835: additional changes fot str_to_date
  New error message
sql/share/norwegian/errmsg.txt:
  Task #835: additional changes fot str_to_date
  New error message
sql/share/polish/errmsg.txt:
  Task #835: additional changes fot str_to_date
  New error message
sql/share/portuguese/errmsg.txt:
  Task #835: additional changes fot str_to_date
  New error message
sql/share/romanian/errmsg.txt:
  Task #835: additional changes fot str_to_date
  New error message
sql/share/russian/errmsg.txt:
  Task #835: additional changes fot str_to_date
  New error message
sql/share/serbian/errmsg.txt:
  Task #835: additional changes fot str_to_date
  New error message
sql/share/slovak/errmsg.txt:
  Task #835: additional changes fot str_to_date
  New error message
sql/share/spanish/errmsg.txt:
  Task #835: additional changes fot str_to_date
  New error message
sql/share/swedish/errmsg.txt:
  Task #835: additional changes fot str_to_date
  New error message
sql/share/ukrainian/errmsg.txt:
  Task #835: additional changes fot str_to_date
  New error message
2004-03-15 18:28:21 +04:00
unknown
1b81fcf8ca Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.valg
2004-03-15 16:57:56 +04:00
unknown
9a3fbf0d96 Fix for valgrind's warning
sql/gstream.cc:
  checking for ending \0 changed with m_limit
sql/gstream.h:
  checking for ending \0 changed with m_limit
sql/item_geofunc.cc:
  we should check for null value before we use val_str result
sql/item_strfunc.cc:
  get rid of annoying warnings
sql/spatial.h:
  error about size_t type fixed
2004-03-15 16:32:53 +04:00
unknown
50499c6d7b fixed comments 2004-03-15 11:02:54 +02:00
unknown
22657f672c my_strtod fixes:
sigsegv protection (exp overflow)
don't return inf!
use errno=EOVERFLOW to signal an overflow (as my_strntod uses errno anyway)
if errno will be too slow, my_strtod can be changed to return overflow status in a parameter (like my_strntod does)


include/m_string.h:
  EOVERFLOW
mysql-test/r/insert.result:
  updated
mysql-test/r/mysqldump.result:
  updated
strings/strtod.c:
  sigsegv protection (exp overflow)
  don't return inf!
  use errno=EOVERFLOW to signal an overflow (as my_strntod uses errno anyway)
  if errno will be too slow, it my_strtod can be changed to return overflow status in a parameter (like my_strntod does)
2004-03-14 17:25:20 +01:00
unknown
ad73b5ac5b Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-03-14 11:51:09 +01:00
unknown
9dc59e9ac8 UUID() bug that manifests itself on low-res (<1 us) timers only
(and not critical at all as it does not result in repeated values)
2004-03-14 11:50:15 +01:00
unknown
4db4cb6665 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_856/mysql-4.1


mysql-test/r/create.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
sql/sql_table.cc:
  Auto merged
2004-03-14 01:33:16 +04:00
unknown
b9793c5473 fixed bug #856 'Naming a key "Primary" causes trouble'
mysql-test/r/create.result:
  added test for bug #856 'Naming a key "Primary" causes trouble'
mysql-test/t/create.test:
  added test for bug #856 'Naming a key "Primary" causes trouble'
2004-03-14 01:31:30 +04:00
unknown
dcd3a0f2ea Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_1427/mysql-4.1
2004-03-13 23:14:41 +04:00
unknown
5a67c11c18 fixed bug #1427 "enum allows duplicate values in the list"
include/mysqld_error.h:
  added ER_DUPLICATED_VALUE_IN_TYPE
mysql-test/r/create.result:
  added test for bug #1427 "enum allows duplicate values in the list"
mysql-test/t/create.test:
  added test for bug #1427 "enum allows duplicate values in the list"
sql/share/czech/errmsg.txt:
  added message for ER_DUPLICATED_VALUE_IN_TYPE
sql/share/danish/errmsg.txt:
  added message for ER_DUPLICATED_VALUE_IN_TYPE
sql/share/dutch/errmsg.txt:
  added message for ER_DUPLICATED_VALUE_IN_TYPE
sql/share/english/errmsg.txt:
  added message for ER_DUPLICATED_VALUE_IN_TYPE
sql/share/estonian/errmsg.txt:
  added message for ER_DUPLICATED_VALUE_IN_TYPE
sql/share/french/errmsg.txt:
  added message for ER_DUPLICATED_VALUE_IN_TYPE
sql/share/german/errmsg.txt:
  added message for ER_DUPLICATED_VALUE_IN_TYPE
sql/share/greek/errmsg.txt:
  added message for ER_DUPLICATED_VALUE_IN_TYPE
sql/share/hungarian/errmsg.txt:
  added message for ER_DUPLICATED_VALUE_IN_TYPE
sql/share/italian/errmsg.txt:
  added message for ER_DUPLICATED_VALUE_IN_TYPE
sql/share/japanese/errmsg.txt:
  added message for ER_DUPLICATED_VALUE_IN_TYPE
sql/share/korean/errmsg.txt:
  added message for ER_DUPLICATED_VALUE_IN_TYPE
sql/share/norwegian-ny/errmsg.txt:
  added message for ER_DUPLICATED_VALUE_IN_TYPE
sql/share/norwegian/errmsg.txt:
  added message for ER_DUPLICATED_VALUE_IN_TYPE
sql/share/polish/errmsg.txt:
  added message for ER_DUPLICATED_VALUE_IN_TYPE
sql/share/portuguese/errmsg.txt:
  added message for ER_DUPLICATED_VALUE_IN_TYPE
sql/share/romanian/errmsg.txt:
  added message for ER_DUPLICATED_VALUE_IN_TYPE
sql/share/russian/errmsg.txt:
  added message for ER_DUPLICATED_VALUE_IN_TYPE
sql/share/serbian/errmsg.txt:
  added message for ER_DUPLICATED_VALUE_IN_TYPE
sql/share/slovak/errmsg.txt:
  added message for ER_DUPLICATED_VALUE_IN_TYPE
sql/share/spanish/errmsg.txt:
  added message for ER_DUPLICATED_VALUE_IN_TYPE
sql/share/swedish/errmsg.txt:
  added message for ER_DUPLICATED_VALUE_IN_TYPE
sql/share/ukrainian/errmsg.txt:
  added message for ER_DUPLICATED_VALUE_IN_TYPE
sql/sql_table.cc:
  added function check_duplicates_in_interval and 
  calling it from mysql_create_table for enum and set
2004-03-13 23:13:31 +04:00
unknown
dc59dffee7 Fix for #1325
We just tried to open binlog's file twice in embedded server


libmysqld/lib_sql.cc:
  Second opening of the log removed
2004-03-13 20:11:41 +04:00
unknown
8b11f1c106 fix to make client.c compile on windows 2004-03-12 18:53:45 +03:00
unknown
4d8ebaf8ca Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2004-03-12 15:43:53 +01:00
unknown
5ddad9ae78 - added AC_PROG_LIBTOOL to innobase/configure.in to be able to compile
MySQL with InnoDB on IBM AIX 5.2 in 64bit mode (which requires a special
   AR flag)


innobase/configure.in:
   - added AC_PROG_LIBTOOL to be able to compile MySQL with InnoDB on IBM
     AIX 5.2 in 64bit mode (which requires a special AR flag)
2004-03-12 15:42:26 +01:00
unknown
c4ddf58428 Rudimentary part of libmysql patch:
set_mysql_error is deployed


libmysql/client_settings.h:
  declaration for set_mysql_error
libmysql/libmysql.c:
  - set_mysql_error moved to client.c
  - st_stmt_errmsg -> set_stmt_error
sql-common/client.c:
  deployment of set_mysql_error
2004-03-12 15:21:48 +03:00
unknown
54042aa975 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.spa
2004-03-12 12:05:08 +04:00
unknown
f84ec3c062 Spatial code changed to get rid of inconsistent this->* operation
Now we use virtual calls instead and redirect VMT pointer of the
geometry object with 'new' operation


sql/field.cc:
  Usage of the Geometry class changed
sql/item_geofunc.cc:
  Usage of the Geometry class changed
sql/spatial.cc:
  Now we rewrite the real VMT of the object with new operation
sql/spatial.h:
  No need for the VMT-like structure and pointers to it
sql/sql_yacc.yy:
  enum items was renamed accordingly to coding standards
2004-03-12 12:04:00 +04:00
unknown
a20bf68aeb merge correcttion in mysql-test/r/mysqldump.result
mysql-test/r/mysqldump.result:
  merge correction
2004-03-11 22:43:10 +04:00
unknown
f3112e648c Merge
mysql-test/r/mysqldump.result:
  e
mysql-test/t/mysqldump.test:
  SCCS merged
2004-03-11 22:01:25 +04:00
unknown
cf58302d8b fixed bug #2591 "mysqldump quotas names inconsistently"
mysql-test/r/mysqldump.result:
  added test for bug #2591 "mysqldump quotas names inconsistently"
mysql-test/t/mysqldump.test:
  added test for bug #2591 "mysqldump quotas names inconsistently"
2004-03-11 18:46:27 +04:00
unknown
188535bba0 Rename:
read_statistic -> read_statistics
(statistic is adjective)


include/mysql.h:
  read_statistic -> read_statistics
libmysql/client_settings.h:
  read_statistic -> read_statistics
libmysql/libmysql.c:
  read_statistic -> read_statistics
libmysqld/lib_sql.cc:
  read_statistic -> read_statistics
sql-common/client.c:
  read_statistic -> read_statistics
2004-03-10 20:12:24 +03:00
unknown
fc654d9ae1 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b3036
2004-03-10 13:36:20 +04:00
unknown
b7155c6511 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
into ua72d24.elisa.omakaista.fi:/home/my/bk/mysql-4.1
2004-03-09 22:03:23 +02:00
unknown
53b3ebdfe0 Fixed Bug#3115. CAST AS DATE with malformed string returns NULL but IS NULL
is false.


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-03-09 22:03:01 +02:00
unknown
fa9543538e - added mysql-@VERSION@.spec to pkgdata_DATA again
(it got lost during a recent BK merge)
2004-03-09 19:23:29 +01:00
unknown
a977474a6a Fix for the bug #3089: SUBSTRING bug when mixed with CONCAT and ORDER BY 2004-03-09 16:52:37 +04:00
unknown
23f9f229d4 Reapply change after merge. 2004-03-08 15:07:49 -06:00
unknown
e120e504d3 Merge
sql/set_var.cc:
  SCCS merged
2004-03-08 14:38:03 -06:00
unknown
d70d167c71 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-03-08 14:05:07 -06:00
unknown
ec118ba6c7 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/set_var.cc:
  Auto merged
2004-03-08 20:59:03 +01:00
unknown
fea8903b0c Comment for do_command moved inside #ifndef EMBEDDED_LIBRARY. 2004-03-08 17:47:42 +03:00
unknown
57c1a8eb38 Make SHOW VARIABLES output really alphabetic.
Note: the patch removes an extra declaration of
the read_only variable. It also assumes that '_'
sorts before [a-z].


mysql-test/r/fulltext_var.result:
  Fix test result to account for SHOW VARIABLES
  output reordering.
sql/set_var.cc:
  Make SHOW VARIABLES output really alphabetic.
2004-03-07 20:19:37 -06:00
unknown
dd41637379 SESSION instead of LOCAL in error messages. 2004-03-07 08:32:00 -06:00
unknown
7dbacbfb6c Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-03-06 10:02:43 -06:00
unknown
80abd5a19c Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_2082/mysql-4.1
2004-03-06 20:02:42 +04:00
unknown
d2b3d9bbff corrected spelling error horisontal->horizontal
into client/mysqltest.c


client/mysqltest.c:
  corrected spelling error horisontal->horizontal
2004-03-06 20:00:54 +04:00
unknown
8e7a2ec9e0 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_2593/mysql-4.1


mysql-test/r/show_check.result:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
2004-03-06 18:27:11 +04:00
unknown
06254e4288 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-03-05 18:24:38 -06:00
unknown
09be7b57f7 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-03-06 00:02:13 +01:00
unknown
1c15d4dfdc Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_2082/mysql-4.1
2004-03-06 03:02:12 +04:00
unknown
f9a59e45ad Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_2082/mysql-4.1


sql/field.cc:
  Auto merged
2004-03-06 03:01:09 +04:00
unknown
17c4d7f361 - added commands --query_vertical and --query_horisontal to client/mysqltest.cc
- get my_strtod to return inf
- get Field_float::store(double) and Field_double::store(float) to set null for 
nan value 
(as extra serg's recomendations to fix for patch on 
 Bug #2082 'mysqldump converts "inf" to null')


client/mysqltest.c:
  added commands --query_vertical and --query_horisontal
mysql-test/r/insert.result:
  converted testcase so as my_strtod can return inf now
mysql-test/r/mysqldump.result:
  converted testcase so as my_strtod can return inf now
mysql-test/t/insert.test:
  corrected tests to using --query_vertical instead of 
  pair (vertical_results,horisontal_results)
sql/field.cc:
  corrected Field_float::store(double) and Field_double::store(double)
  to set null for nan value
strings/strtod.c:
  get my_strtod to return inf
2004-03-06 03:00:21 +04:00
unknown
199c90574a Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-03-05 12:38:36 -06:00
unknown
755f693965 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-03-05 19:50:12 +02:00
unknown
28f0e32879 Portability fixes
mysql-test/r/show_check.result:
  Updated results
mysql-test/t/show_check.test:
  Portability fix (for 64 bit platforms)
mysys/hash.c:
  Portablity fix
sql/gen_lex_hash.cc:
  Don't include mysql_priv.h;  Causes build errors on a lot of platforms
sql/lex_symbol.h:
  Moved symbols here from mysql_priv.h to avoid including mysql_priv.h in gen_lex_hash.cc
sql/mysql_priv.h:
  Move symbols and struct to lex_symbol.h
sql/sql_db.cc:
  Don't use sql_alloc/sql_free methods in sql_string.h
sql/sql_help.cc:
  Don't use sql_alloc/sql_free methods in sql_string.h
sql/sql_string.h:
  Don't use sql_alloc/sql_free methods in sql_string.h
  This makes the code faster and more portable
sql/sql_yacc.yy:
  Don't use sql_alloc/sql_free methods in sql_string.h
2004-03-05 19:49:50 +02:00
unknown
50263c99f4 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-03-05 11:16:06 -06:00
unknown
e3af1fab8c Fix for C++ style declaration 2004-03-05 19:04:59 +03:00
unknown
02ce92d68d Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mydev/mysql/mysql-4.1
2004-03-05 15:20:45 +01:00
unknown
7b626ab7ca commented testcases in show_check.test with quotation marks in table name
to avoid troubles with OS which don't support these symbols in file name
used create table 'a/b' as hook for WL#1324 which should fix this problem


mysql-test/r/show_check.result:
  commented testcases with quotation marks in table name
  to avoid troubles with OS which don't support these symbols in file name
  used create table 'a/b' as hook for WL#1324 which should fix this problem
mysql-test/t/show_check.test:
  commented testcases with quotation marks in table name
  to avoid troubles with OS which don't support these symbols in file name
  used create table 'a/b' as hook for WL#1324 which should fix this problem
2004-03-05 17:57:36 +04:00