Commits · 2511cdcd6ceb35aa5b13412e2c33d2f4114dfdea · nexedi / MariaDB

15 Mar, 2004 5 commits

merge · 2511cdcd

unknown authored Mar 15, 2004


sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/sql_select.cc:
  Auto merged

2511cdcd

Task #835: additional changes fot str_to_date · afedd9f8

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

afedd9f8

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

Fix for valgrind's warning · 9a3fbf0d

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

9a3fbf0d

fixed comments · 50499c6d
unknown authored Mar 15, 2004

50499c6d

14 Mar, 2004 3 commits

my_strtod fixes: · 22657f67

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)

22657f67

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

13 Mar, 2004 5 commits

Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 4db4cb66

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

4db4cb66

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

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'

b9793c54

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

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

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

5a67c11c

Fix for #1325 · dc59dffe

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

dc59dffe

12 Mar, 2004 6 commits

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

8b11f1c1
Merge mysql.com:/space/my/mysql-4.1 · 4d8ebaf8
unknown authored Mar 12, 2004
```
into mysql.com:/space/my/mysql-4.1-build
```
4d8ebaf8

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

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)

5ddad9ae

Rudimentary part of libmysql patch: · c4ddf584

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

c4ddf584

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

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

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

f84ec3c0

11 Mar, 2004 3 commits

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

Merge · f3112e64

unknown authored Mar 11, 2004


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

f3112e64

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

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"

cf58302d

10 Mar, 2004 2 commits

Rename: · 188535bb

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

188535bb

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

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


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


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


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