1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-10 23:02:54 +03:00
Commit Graph

12619 Commits

Author SHA1 Message Date
unknown
5bc89a9644 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0


sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
2004-03-06 10:43:53 +02:00
unknown
aa20bd9e8c Ensure that one can't from the command line set a variable too small. (Bug #2710)
Allow one to force lower_case_table_names to 0, even if the file system is case insensitive. This fixes some issues on Mac OS X (Bug #2994)
Added variables "lower_case_file_system", "version_compile_os" and "license"


mysql-test/t/lowercase_table3-master.opt:
  Rename: mysql-test/t/lowercase_table2-master.opt -> mysql-test/t/lowercase_table3-master.opt
mysys/my_getopt.c:
  Ensure that one can't from the command line set a variable too small (could happen when sub_size was set)
sql/mysql_priv.h:
  Added lower_case_file_system
sql/mysqld.cc:
  Allow one to force lower_case_table_names to 0, even if the file system is case insensitive
sql/set_var.cc:
  Added variable "lower_case_file_system"
  Added variable "version_compile_os"
  Added variable "license"
sql/set_var.h:
  Added support for read only strings
sql/sql_select.cc:
  Make join optimizer killable
2004-03-06 10:43:35 +02: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
8550c7abeb fixed Bug #2985
"Table truncated when creating another table name with Spaces"
added to check_db_name, check_table_name and check_column_name
test for end space


mysql-test/r/create.result:
  added test for Bug #2985 
   "Table truncated when creating another table name with Spaces"
mysql-test/t/create.test:
  added test for Bug #2985 
   "Table truncated when creating another table name with Spaces"
sql/sql_db.cc:
  cancel strip end spaces for database name
sql/sql_parse.cc:
  cancel strip end spaces for database name
sql/table.cc:
  added to check_db_name, check_table_name and check_column_name 
  test for end space
2004-03-05 22:13:33 +04: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
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
unknown
cd7275396c Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/item_create.cc:
  Auto merged
2004-03-05 00:20:24 +01:00
unknown
1530dd73a0 UNHEX() function 2004-03-04 23:18:54 +01:00
unknown
bc9de3d455 fixed Bug #3051 "FLOOR returns invalid"
mysql-test/r/func_math.result:
  added test for Bug #3051 "FLOOR returns invalid"
mysql-test/t/func_math.test:
  added test for Bug #3051 "FLOOR returns invalid"
2004-03-04 22:11:33 +04:00
unknown
c8bfc2324b Fixed bug #2082 'mysqldump converts "inf" to NULL' and
added commands vertical_results and horisontal_results to client/mysqltest.c


client/mysqltest.c:
  added commands vertical_results and horisontal_results
mysql-test/r/insert.result:
  added test for bug #2082 'mysqldump converts "inf" to NULL'
mysql-test/t/insert.test:
  Fixed bug #2082 'mysqldump converts "inf" to NULL'
sql/field.cc:
  added test for Fixed bug #2082 'mysqldump converts "inf" to NULL'
2004-03-04 21:08:14 +04:00
unknown
d4f43e511c invalidation of locking for write tables (BUG#2693)
fixed linking query_prealloc_size to query cache presence


mysql-test/r/query_cache.result:
  test of QC invalidation by LOCK command
mysql-test/t/query_cache.test:
  test of QC invalidation by LOCK command
sql/mysqld.cc:
  new variable query_cache_wlock_invalidate
  fixed query_prealloc_size with QC absence
sql/set_var.cc:
  new variable query_cache_wlock_invalidate
sql/sql_cache.cc:
  new method for table invalidation
sql/sql_cache.h:
  new method for table invalidation
sql/sql_class.h:
  new variable query_cache_wlock_invalidate
sql/sql_parse.cc:
  layout fixed
2004-03-04 18:32:55 +02:00
unknown
930399d773 Merging
sql/item_subselect.cc:
  Auto merged
sql/item_subselect.h:
  Auto merged
mysql-test/r/subselect.result:
  merging
mysql-test/t/subselect.test:
  merging
2004-03-04 17:52:06 +04:00
unknown
53368efea3 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-03-04 14:48:28 +01:00
unknown
4924f276db drop tables in windows-compatible order 2004-03-04 14:47:33 +01:00
unknown
96a1f9d72e Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1


sql/item_create.cc:
  Auto merged
2004-03-04 10:07:32 +02:00
unknown
afa6728a9f Optimized GIS functions
heap/hp_delete.c:
  Added comments
mysql-test/r/gis.result:
  Updated results after name changes (all results line are unchanged)
mysql-test/r/show_check.result:
  Update test results after fix in hp_delete.cc
mysql-test/t/gis.test:
  Changed table names to longer, hopefully non conflicting ones.
  Added missing drop table
mysys/hash.c:
  Inendation cleanup
mysys/tree.c:
  Updated comments
  Decrease tree->allocated on delete (for status)
sql/field.cc:
  Added safety checking for GIS objects
sql/gstream.cc:
  Added copyright message
  Made a lot of speed/space optimizations
  Changed class names to be MySQL compliant
sql/gstream.h:
  Made a lot of speed/space optimizations
  Changed class names to be MySQL compliant
sql/item_create.cc:
  Indentation fixup
sql/item_geofunc.cc:
  Use new gis interface functions and new gis class names.
  Simple optimizations
  Indentation fixups
  Fixed a lot of unlikely but possible errors.
sql/item_geofunc.h:
  Moved SRID_SIZE to spatial.h
sql/spatial.cc:
  Added copyright message
  Made a lot of speed/space optimizations
  Changed class names to be MySQL compliant
sql/spatial.h:
  Made a lot of speed/space optimizations
  Changed class names to be MySQL compliant
  Indentation fixes
  Use bool instead of int as result type for functions that only return 0 or 1
sql/sql_string.cc:
  Simple optimizations
sql/sql_string.h:
  Simple cleanups
sql/structs.h:
  Added LEX_STRING_WITH_INIT (needed by spatial.cc)
2004-03-04 08:50:37 +02:00
unknown
edf6ad9041 Bug #2959 UTF8 charset breaks joins with mixed column/string constant 2004-03-03 11:22:25 +04:00
unknown
5aa57221d8 Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0


sql/sp_head.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2004-03-02 16:01:02 +01:00
unknown
857b59578c Fixed BUG#2777: Stored procedure doesn't observe definer's rights.
SQL SECURITY DEFINER must enforce reduced rights too, not just additional rights.


mysql-test/r/sp-security.result:
  Test case for BUG#2777: Make sure that SQL SECURITY DEFINER enforces reduced rights.
mysql-test/t/sp-security.test:
  Test case for BUG#2777: Make sure that SQL SECURITY DEFINER enforces reduced rights.
sql/sql_acl.cc:
  Clear rights before changing them in acl_getroot_no_password so that
  reduced rights work too, and take care of db acls as well.
2004-03-02 11:52:19 +01:00
unknown
722e0ec378 fix for a bug #2953.
When password was granted with a global grant, then granting 
privileges on database level, without password being specified, 
will temporary (in memory) set password to ''.
2004-03-01 21:54:08 +02:00
unknown
bf53c87049 Fix for BUG#3017
"wrong Relay_Log_Pos if Rotate is in the middle of a transaction in relay log"
increment 'pending' instead of 'relay_log_pos'.


mysql-test/r/rpl_trunc_binlog.result:
  result update
sql/log_event.cc:
  - corrected error message
  - in Rotate_log_event::exec_event(), if we're in a transaction (which
  can happen if the I/O slave thread reconnected while reading a
  transaction), don't increment relay_log_pos but pending instead.
  Otherwise, relay_log_pos becomes garbage (and so if slave stops at that
  moment, it will never restart).
2004-03-01 00:46:31 +01:00
unknown
56f8312782 bug#3011 - multi-byte charset in fulltext
myisam/ft_nlq_search.c:
  bug#3011 - multi-byte charset in fulltext
  cleanup
2004-02-29 22:58:45 +01:00
unknown
45f39ff1de small after-merge fixes (error messages).
include/mysqld_error.h:
  more generic error code
mysql-test/r/func_compress.result:
  update after message change
mysql-test/r/loaddata.result:
  update after message change
mysql-test/r/warnings.result:
  update after message change
sql/share/czech/errmsg.txt:
  message change
sql/share/danish/errmsg.txt:
  message change
sql/share/dutch/errmsg.txt:
  message change
sql/share/english/errmsg.txt:
  message change
sql/share/estonian/errmsg.txt:
  message change
sql/share/french/errmsg.txt:
  message change
sql/share/german/errmsg.txt:
  message change
sql/share/greek/errmsg.txt:
  message change
sql/share/hungarian/errmsg.txt:
  message change
sql/share/italian/errmsg.txt:
  message change
sql/share/japanese/errmsg.txt:
  message change
sql/share/korean/errmsg.txt:
  message change
sql/share/norwegian-ny/errmsg.txt:
  message change
sql/share/norwegian/errmsg.txt:
  message change
sql/share/polish/errmsg.txt:
  message change
sql/share/portuguese/errmsg.txt:
  message change
sql/share/romanian/errmsg.txt:
  message change
sql/share/russian/errmsg.txt:
  message change
sql/share/slovak/errmsg.txt:
  message change
sql/share/spanish/errmsg.txt:
  message change
sql/share/swedish/errmsg.txt:
  message change
sql/share/ukrainian/errmsg.txt:
  message change
2004-02-28 23:36:41 +01:00
unknown
31531bfae5 make func_misc portable
on different systems sprintf("%.3", 1.555499999999999) behaves differently
2004-02-28 11:24:49 +01:00
unknown
b2674f76c1 restored func_misc.result after my_strtod fix 2004-02-27 23:33:29 +01:00
unknown
5fea4d8145 - fixed test result: FORMAT(12345.5555,3) really should return "12,345.556" 2004-02-27 10:14:43 +01:00
unknown
83188d50cc Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1


sql/mysqld.cc:
  Auto merged
2004-02-24 19:14:41 +02:00
unknown
8388a57a96 minor omission that effectively disabled my_strtod fixed :)
mysql-test/r/bigint.result:
  updated
mysql-test/r/func_misc.result:
  updated
mysql-test/t/bigint.test:
  updated
2004-02-24 12:31:33 +01:00
unknown
59fe74f7fb Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_2719/mysql-4.1
2004-02-22 19:07:21 +04:00
unknown
9aecd2044e Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2004-02-22 11:30:58 +01:00
unknown
a61331d805 Complement to
ChangeSet 1.1616.23.1
Fix for BUG#1858 "SQL-Thread stops working when using optimize table".
A test for this.


sql/sql_base.cc:
  In remove_table_from_cache(), kill only delayed threads.
2004-02-22 11:22:51 +01:00
unknown
07b40e621e Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1


innobase/rem/rem0cmp.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
sql-common/client.c:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
2004-02-22 11:01:28 +02:00
unknown
a594279dc9 Updated results 2004-02-22 10:58:22 +02:00
unknown
16874ede63 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0
2004-02-22 10:52:43 +02:00
unknown
54cefbab0f Merge with 4.0 to get fixed tests
mysql-test/t/lock_tables_lost_commit.test:
  Auto merged
2004-02-22 10:04:08 +02:00
unknown
2100d85c4f Move tests that uses innodb to innodb.test
mysql-test/t/lock_tables_lost_commit.test:
  Ensure that innodb is compiled in
2004-02-22 09:58:51 +02:00
unknown
192bf819eb merge with 4.0
BitKeeper/etc/ignore:
  auto-union
VC++Files/comp_err/comp_err.dsp:
  Auto merged
VC++Files/my_print_defaults/my_print_defaults.dsp:
  Auto merged
VC++Files/myisampack/myisampack.dsp:
  Auto merged
acinclude.m4:
  Auto merged
innobase/buf/buf0buf.c:
  Auto merged
innobase/com/com0shm.c:
  Auto merged
innobase/data/data0data.c:
  Auto merged
innobase/ha/ha0ha.c:
  Auto merged
innobase/include/buf0buf.ic:
  Auto merged
innobase/include/dict0dict.h:
  Auto merged
innobase/include/ibuf0ibuf.h:
  Auto merged
innobase/include/lock0lock.h:
  Auto merged
innobase/include/mtr0log.h:
  Auto merged
innobase/include/mtr0mtr.h:
  Auto merged
innobase/include/os0proc.h:
  Auto merged
innobase/include/os0thread.h:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/include/sync0sync.h:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/log/log0recv.c:
  Auto merged
innobase/mem/mem0dbg.c:
  Auto merged
innobase/mtr/mtr0mtr.c:
  Auto merged
innobase/os/os0proc.c:
  Auto merged
innobase/page/page0page.c:
  Auto merged
innobase/que/que0que.c:
  Auto merged
innobase/rem/rem0cmp.c:
  Auto merged
innobase/row/row0ins.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
innobase/sync/sync0sync.c:
  Auto merged
innobase/trx/trx0rec.c:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
innobase/ut/ut0mem.c:
  Auto merged
innobase/ut/ut0ut.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
scripts/mysql_config.sh:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2004-02-22 09:50:59 +02:00
unknown
984750e13e After merge fixes
Fixed wrong test of database name (affected optimization of ORDER BY)


VC++Files/client/mysqlclient.dsp:
  Add my_file.c
VC++Files/mysys/mysys.dsp:
  Add my_file.c
mysql-test/r/negation_elimination.result:
  Fix wrong test
sql-common/client.c:
  After merge fix
sql/sql_base.cc:
  Fixed testing of database name
2004-02-22 08:09:32 +02:00
unknown
d8f1d154a4 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-02-22 00:20:09 +01:00
unknown
7759360dca ftb +(+(many -parens)) bug fixed 2004-02-22 00:19:36 +01:00
unknown
de264ea443 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-02-20 23:18:32 +01:00
unknown
bdf490541d fixed comparation of tables/database names with --lower_case_table_names (BUG#2880)
mysql-test/r/lowercase_table.result:
  test of multi-update/multi-delete
mysql-test/t/lowercase_table.test:
  test of multi-update/multi-delete
sql/sql_cache.cc:
  correct databese names comparation
sql/sql_parse.cc:
  correct table names comparation in multi-delete
2004-02-20 22:44:54 +02:00
unknown
74fa5f09ef longer myisam keys
mysql-test/r/ctype_utf8.result:
  updated
mysql-test/r/key.result:
  updated
mysql-test/r/myisam.result:
  updated
mysql-test/r/type_blob.result:
  updated
mysql-test/t/ctype_utf8.test:
  updated
mysql-test/t/key.test:
  updated
mysql-test/t/myisam.test:
  updated
mysql-test/t/type_blob.test:
  updated
2004-02-20 20:38:34 +01:00
unknown
8b2b219fb5 merge with 4.0 to get security fixes and latest bug fixes
BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183:
  Auto merged
VC++Files/mysql.dsw:
  Auto merged
VC++Files/mysys/mysys.dsp:
  Auto merged
innobase/buf/buf0buf.c:
  Auto merged
innobase/include/srv0start.h:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/mem/mem0dbg.c:
  Auto merged
innobase/que/que0que.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
innobase/sync/sync0rw.c:
  Auto merged
innobase/sync/sync0sync.c:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
libmysql/manager.c:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/unireg.cc:
  Auto merged
VC++Files/sql/mysqld.dsp:
  Removed wrong define USE_SYMLINK
include/config-win.h:
  Use original code
innobase/srv/srv0srv.c:
  merge
innobase/usr/usr0sess.c:
  merge
libmysql/libmysql.c:
  merge
mysql-test/r/func_test.result:
  merge
mysql-test/t/func_test.test:
  merge
sql/log.cc:
  merge
sql/mysqld.cc:
  merge
2004-02-20 17:43:02 +02:00
unknown
5367d17cd4 fixed for BUG #2719 "Heap tables status shows wrong or missing data"
heap/hp_delete.c:
  added code for right calculation 
  of Index_length in HEAP tables with BTREE indexes
heap/hp_write.c:
  added code for right calculation 
  of Index_length in HEAP tables with BTREE indexes
mysql-test/r/show_check.result:
  added test for BUG #2719 "Heap tables status shows wrong or missing data"
mysql-test/t/show_check.test:
  added test for BUG #2719 "Heap tables status shows wrong or missing data"
2004-02-20 00:33:16 +04:00
unknown
e022b27860 Fix for a bug #2799.
Multi-table delete's with tables having foreign key constraints
did not return the error.

Also added tests for multi-table updates.
2004-02-19 19:43:46 +02:00
unknown
3804200122 Fix for #2237 and #2490 (analyze and check for RTree keys)
Now checking of the RTree keys works without errors.
Worklog entry about appropriate checkup's routine for the RTree added


myisam/mi_check.c:
  HA_SPATIAL checks added
mysql-test/r/gis-rtree.result:
  Appropriate test resutl
mysql-test/t/gis-rtree.test:
  test case
2004-02-19 17:22:38 +04:00