Commits · 1c10a01438af417de7bd3de0349eed343225b338 · nexedi / MariaDB

15 Mar, 2004 5 commits

Fix for bug#2972 Problem the the CONV() function · 1c10a014
unknown authored Mar 15, 2004

1c10a014

Task #835: additional changes fot str_to_date · eb1f6c53

unknown authored Mar 15, 2004


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

eb1f6c53

Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · cbda8193
unknown authored Mar 15, 2004
```
into deer.(none):/home/hf/work/mysql-4.1.valg
```
cbda8193

Fix for valgrind's warning · ed49cb53

unknown authored Mar 15, 2004


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

ed49cb53

fixed comments · e91c5cd0
unknown authored Mar 15, 2004

e91c5cd0

14 Mar, 2004 3 commits

my_strtod fixes: · 73fd7b44

unknown authored Mar 14, 2004

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)

73fd7b44

Merge bk-internal:/home/bk/mysql-4.1/ · cdf0a459
unknown authored Mar 14, 2004
```
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
```
cdf0a459
UUID() bug that manifests itself on low-res (<1 us) timers only · fdf1a9b1
unknown authored Mar 14, 2004
```
(and not critical at all as it does not result in repeated values)
```
fdf1a9b1

13 Mar, 2004 5 commits

Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 8b72fcf6

unknown authored Mar 14, 2004

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

8b72fcf6

fixed bug #856 'Naming a key "Primary" causes trouble' · 0c1d7c3b

unknown authored Mar 14, 2004


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'

0c1d7c3b

Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 364baccb
unknown authored Mar 13, 2004
```
into eagle.mysql.r18.ru:/home/vva/work/BUG_1427/mysql-4.1
```
364baccb

fixed bug #1427 "enum allows duplicate values in the list" · b869a6bd

unknown authored Mar 13, 2004


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

b869a6bd

Fix for #1325 · 88d4d118

unknown authored Mar 13, 2004

We just tried to open binlog's file twice in embedded server


libmysqld/lib_sql.cc:
  Second opening of the log removed

88d4d118

12 Mar, 2004 6 commits

fix to make client.c compile on windows · bea2dae7
unknown authored Mar 12, 2004

bea2dae7
Merge mysql.com:/space/my/mysql-4.1 · f1ffc227
unknown authored Mar 12, 2004
```
into mysql.com:/space/my/mysql-4.1-build
```
f1ffc227

- added AC_PROG_LIBTOOL to innobase/configure.in to be able to compile · cc730742

unknown authored Mar 12, 2004

   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)

cc730742

Rudimentary part of libmysql patch: · bf559af0

unknown authored Mar 12, 2004

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

bf559af0

Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 4cf338f8
unknown authored Mar 12, 2004
```
into deer.(none):/home/hf/work/mysql-4.1.spa
```
4cf338f8

Spatial code changed to get rid of inconsistent this->* operation · 97af7fae

unknown authored Mar 12, 2004

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

97af7fae

11 Mar, 2004 3 commits

merge correcttion in mysql-test/r/mysqldump.result · f580b954
unknown authored Mar 11, 2004
```
mysql-test/r/mysqldump.result:
  merge correction
```
f580b954

Merge · 7f435331

unknown authored Mar 11, 2004


mysql-test/r/mysqldump.result:
  e
mysql-test/t/mysqldump.test:
  SCCS merged

7f435331

fixed bug #2591 "mysqldump quotas names inconsistently" · b995db04

unknown authored Mar 11, 2004


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"

b995db04

10 Mar, 2004 2 commits

Rename: · 8ad53800

unknown authored Mar 10, 2004

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

8ad53800

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · bfe16627
unknown authored Mar 10, 2004
```
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b3036
```
bfe16627

09 Mar, 2004 4 commits
- Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1 · c7b208dd
  unknown authored Mar 09, 2004
```
into ua72d24.elisa.omakaista.fi:/home/my/bk/mysql-4.1
```
  c7b208dd
- Fixed Bug#3115. CAST AS DATE with malformed string returns NULL but IS NULL · b71a52ea
  unknown authored Mar 09, 2004
```
is false.


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
```
  b71a52ea
- - added mysql-@VERSION@.spec to pkgdata_DATA again · 11003afa
  unknown authored Mar 09, 2004
```
   (it got lost during a recent BK merge) 
```
  11003afa
- Fix for the bug #3089: SUBSTRING bug when mixed with CONCAT and ORDER BY · 202ec72e
  unknown authored Mar 09, 2004
  
  202ec72e
08 Mar, 2004 6 commits
- Reapply change after merge. · 53d4a566
  unknown authored Mar 08, 2004
  
  53d4a566
- Merge · fb26dee2
  unknown authored Mar 08, 2004
```
sql/set_var.cc:
  SCCS merged
```
  fb26dee2
- Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 · cc4eb2b1
  unknown authored Mar 08, 2004
```
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
```
  cc4eb2b1
- Merge bk-internal:/home/bk/mysql-4.1/ · c4f8bd97
  unknown authored Mar 08, 2004
```
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/set_var.cc:
  Auto merged
```
  c4f8bd97
- Comment for do_command moved inside #ifndef EMBEDDED_LIBRARY. · 162fd19e
  unknown authored Mar 08, 2004
  
  162fd19e
- Make SHOW VARIABLES output really alphabetic. · 63682d0d
  unknown authored Mar 07, 2004
```
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.
```
  63682d0d
07 Mar, 2004 1 commit
- SESSION instead of LOCAL in error messages. · ce3638c2
  unknown authored Mar 07, 2004
  
  ce3638c2
06 Mar, 2004 5 commits
- Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 · 606c7c28
  unknown authored Mar 06, 2004
```
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
```
  606c7c28
- Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 4af7f05a
  unknown authored Mar 06, 2004
```
into eagle.mysql.r18.ru:/home/vva/work/BUG_2082/mysql-4.1
```
  4af7f05a
- corrected spelling error horisontal->horizontal · 7c84dd19
  unknown authored Mar 06, 2004
```
into client/mysqltest.c


client/mysqltest.c:
  corrected spelling error horisontal->horizontal
```
  7c84dd19
- Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1 · 438d16bf
  unknown authored Mar 06, 2004
```
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
```
  438d16bf
- Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 · 71a1b772
  unknown authored Mar 05, 2004
```
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
```
  71a1b772