1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-13 02:22:51 +03:00
Commit Graph

4151 Commits

Author SHA1 Message Date
0153488a02 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0
2004-01-19 23:10:18 +01:00
3b98955a5c Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_2310/mysql-4.1
2004-01-20 00:34:38 +04:00
7db61ce021 Fixed bug #2310 "INET_ATON handles short-forms addresses incorrectly"
mysql-test/r/func_misc.result:
  added new test for inet_aton (short-forms addresses)
mysql-test/t/func_misc.test:
  added new test for inet_aton (short-forms addresses)
sql/item_func.cc:
  Change Item_func_inet_aton::val_int to parse short-forms addresses correctly
2004-01-20 00:32:25 +04:00
d2b5444181 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into bar.intranet.mysql.r18.ru:/usr/home/bar/mysql-4.1


sql/item.h:
  Auto merged
2004-01-19 19:21:07 +04:00
162f1dc5e6 UCS-2 aligning 0xAA -> 0x00AA 2004-01-19 19:16:30 +04:00
9af09d1266 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-01-19 14:23:18 +01:00
06de76aec5 field length convertion (bytes->chars) should be done with rounding UP. 2004-01-19 14:22:38 +01:00
3991a1d0d1 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2004-01-19 14:15:40 +02:00
a66924353a Test case for the bug #2198: SELECT INTO OUTFILE (with Sub-Select) Problem. 2004-01-19 14:10:05 +04:00
2f7bf967fd Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b2182


client/mysqldump.c:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
2004-01-19 13:00:51 +04:00
cf2b6edaad Fix deprecation warning - database_engine => storage_engine
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-01-18 22:30:35 +00:00
2d6ff22e94 merge fixes 2004-01-17 17:18:32 +02:00
aa35b8c1b1 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-insert-4.1


sql/sql_derived.cc:
  Auto merged
2004-01-17 15:28:56 +02:00
d63d204c07 new test added
test fixed
2004-01-17 15:28:20 +02:00
fb006367e5 merge
sql/mysql_priv.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_help.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2004-01-17 13:13:48 +02:00
19fe657f4e commit of forgoten test 2004-01-17 13:09:41 +02:00
2de832dbf9 switched to new syntax (TYPE->ENGINE)
check of memory allocation operation was added


mysql-test/r/subselect_innodb.result:
  switched to new syntax
mysql-test/t/subselect_innodb.test:
  switched to new syntax
sql/sql_select.cc:
  check of memory allocation operation
2004-01-17 13:00:46 +02:00
dea4107141 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-sub-4.1
2004-01-17 12:18:46 +02:00
12e7d6a39d mysqldump results fixed 2004-01-17 12:03:14 +02:00
adca234881 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-sub-4.1


mysql-test/r/subselect_innodb.result:
  Auto merged
mysql-test/t/subselect_innodb.test:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_union.cc:
  Auto merged
2004-01-17 11:53:04 +02:00
e0bd7faf5b Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-drop-4.1


mysql-test/r/query_cache.result:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
sql/sql_db.cc:
  Auto merged
2004-01-17 10:02:01 +02:00
c217c4867b Two bug fixes
mysql-test/t/mysqldump.test:
  Fixing a test to encompass latest Jani's patch to mysqldump.c
sql/sql_union.cc:
  Fix for the unlock problem with a typo correction.
2004-01-16 20:05:08 +02:00
d894ca49bd Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2004-01-16 15:26:58 +02:00
130ae28cca Fixed table crash bug when updating row > 16M (Bug #2159)
myisam/mi_dynrec.c:
  Fixed table crash bug when updating row > 16M
2004-01-15 21:39:56 +01:00
306a903b37 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/sql_parse.cc:
  Auto merged
2004-01-15 22:05:24 +02:00
ae4b94598c an obvious bug in _mi_key_cmp fixed (BUG#2295 - range on blobs) 2004-01-15 16:31:27 +01:00
d372811cb2 I forgot to add the test in the previous commit :(
Blame me!
2004-01-15 16:10:44 +04:00
fd427c063d Fic for Bug 2367: INSERT() behaviour is different for different charsets. 2004-01-15 13:27:20 +04:00
6eaa5c3a66 assigned correct lex->current_select for derived tables (BUG#2349)
moved LIMIT initialialization, because it is need only for single select derived table


mysql-test/r/derived.result:
  test suite for BUG#2349
mysql-test/t/derived.test:
  test suite for BUG#2349
sql/sql_derived.cc:
  assigned correct lex->current_select (BUG#2349)
  moved LIMIT initialialization, because it is need only for single select
2004-01-14 15:15:42 +02:00
2f69de8e0e Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/sql_show.cc:
  Auto merged
2004-01-14 14:08:56 +01:00
fd7d543adc show create tests 2004-01-14 12:29:30 +01:00
21e2c72bfb a fix (bug #2361: ALTER TABLE ... DROP PRIMARY KEY drops a non-primary key). 2004-01-13 16:18:37 +04:00
3640f7e11b Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-01-13 12:31:51 +01:00
febc79bb5d BUG#2304 - HANDLER and tables in non-current db 2004-01-13 12:31:25 +01:00
e1d5f62041 Fixed Bug #2338 Trigonometric arithmetic problem
by fixing optimizer bug with help of 'volatile' keyword


mysql-test/r/func_math.result:
  added tests for BUG #2338 Trigonometric arithmetic problems
mysql-test/t/func_math.test:
  added tests for BUG #2338 Trigonometric arithmetic problems
sql/item_func.cc:
  added keyword volatile in Item_func_acos::val and Item_func_asin::val
  to calm optimizer down and to avoid it's bug
2004-01-12 22:47:26 -04:00
7e50f03271 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2004-01-12 16:28:12 +02:00
e2ab8558e8 opt_sum.cc:
A fix for a bug #3189, pertaining to crashing MySQL server when a query with MIN / MAX on the BLOB column is to be optimised


sql/opt_sum.cc:
  A fix for a bug #3189, pertaining to crashing MySQL server when a query with MIN / MAX on the BLOB column is to be optimised
2004-01-12 16:25:13 +02:00
24f8054460 Detect unexpected return codes of mysqltest in mysql-test-run.
This way, a crash of mysqltest will be visible in the test logs
(output of mysql-test-run).


mysql-test/mysql-test-run.sh:
  by design mysqltest returns 0 or 1 or 2 (see the exit()s and the return()
  of main()). So any greater code is a crash, I guess.
  On build and on my machine, 139 is segfault and 134 is assertion failure.
2004-01-11 18:15:19 +01:00
9d8bf6980a A fix (bug #2335: Inconsistancy with handling of Years and NOW() function).
The test might fail if one runs it at 23:59:59 Dec 31


mysql-test/r/type_year.result:
  a fix (bug #2335: Inconsistancy with handling of Years and NOW() function)
mysql-test/t/type_year.test:
  a fix (bug #2335: Inconsistancy with handling of Years and NOW() function)
sql/field.h:
  a fix (bug #2335: Inconsistancy with handling of Years and NOW() function)
2004-01-11 14:12:46 +04:00
d84ee4d503 null.result, null.test:
Fix for a bug #2219, regarding a bad cast to integer from NULL
item_func.h:
  Fix for a bug #2219, regarding a bad cast to integer from NULL
sql_parse.cc:
  A fix for a bug #2207, with mysql server haning on option setting


sql/sql_parse.cc:
  A fix for a bug #2207, with mysql server haning on option setting
sql/item_func.h:
  Fix for a bug #2219, regarding a bad cast to integer from NULL
mysql-test/t/null.test:
   Fix for a bug #2219, regarding a bad cast to integer from NULL
mysql-test/r/null.result:
   Fix for a bug #2219, regarding a bad cast to integer from NULL
2004-01-09 22:28:29 +02:00
21bef0ed8c Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-01-09 12:40:09 +01:00
3f0d245178 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b2231
2004-01-09 11:15:14 +04:00
aafca9f08d An improvement of the fix for the bug #2231: string column,
INDEX+LIKE, don't take the ESCAPE character. (ver. 2)
2004-01-08 12:24:36 +04:00
fbf563e86a allow UPDATE and DELETE stetements with tables derived from subquery if they are not updated (BUG#2117)
allow delete table by alias in multi-delete statement



include/mysqld_error.h:
  new error message about non-updateable table
mysql-test/r/derived.result:
  test of multi-update and multi-delete
mysql-test/t/derived.test:
  test of multi-update and multi-delete
sql/share/czech/errmsg.txt:
  new error message about non-updateable table
sql/share/danish/errmsg.txt:
  new error message about non-updateable table
sql/share/dutch/errmsg.txt:
  new error message about non-updateable table
sql/share/english/errmsg.txt:
  new error message about non-updateable table
sql/share/estonian/errmsg.txt:
  new error message about non-updateable table
sql/share/french/errmsg.txt:
  new error message about non-updateable table
sql/share/german/errmsg.txt:
  new error message about non-updateable table
sql/share/greek/errmsg.txt:
  new error message about non-updateable table
sql/share/hungarian/errmsg.txt:
  new error message about non-updateable table
sql/share/italian/errmsg.txt:
  new error message about non-updateable table
sql/share/japanese/errmsg.txt:
  new error message about non-updateable table
sql/share/korean/errmsg.txt:
  new error message about non-updateable table
sql/share/norwegian-ny/errmsg.txt:
  new error message about non-updateable table
sql/share/norwegian/errmsg.txt:
  new error message about non-updateable table
sql/share/polish/errmsg.txt:
  new error message about non-updateable table
sql/share/portuguese/errmsg.txt:
  new error message about non-updateable table
sql/share/romanian/errmsg.txt:
  new error message about non-updateable table
sql/share/russian/errmsg.txt:
  new error message about non-updateable table
sql/share/serbian/errmsg.txt:
  new error message about non-updateable table
sql/share/slovak/errmsg.txt:
  new error message about non-updateable table
sql/share/spanish/errmsg.txt:
  new error message about non-updateable table
sql/share/swedish/errmsg.txt:
  new error message about non-updateable table
sql/share/ukrainian/errmsg.txt:
  new error message about non-updateable table
sql/sql_parse.cc:
  allow delete table by alias
  separate error message for try to delete derived table
sql/sql_update.cc:
  test "is updated table derived?"
sql/sql_yacc.yy:
  error message in case of try to update derived table
2004-01-04 23:44:33 +02:00
b21d8b0eff removed droping field->query_id for reinitialization tables for subquery.
(BUG#2089)


mysql-test/r/subselect_innodb.result:
  correct results
sql/mysql_priv.h:
  new parameter for setup_tables()
sql/sql_base.cc:
  new parameter for setup_tables() added to avoid dropping query_id of fields during reinitialization subquery
sql/sql_class.cc:
  layout fixed
sql/sql_help.cc:
  new parameter for setup_tables()
sql/sql_insert.cc:
  new parameter for setup_tables()
sql/sql_lex.cc:
  removed incorrect code
sql/sql_load.cc:
  new parameter for setup_tables()
sql/sql_olap.cc:
  new parameter for setup_tables()
sql/sql_prepare.cc:
  new parameter for setup_tables()
sql/sql_select.cc:
  new parameter for setup_tables()
sql/sql_update.cc:
  new parameter for setup_tables()
2004-01-03 00:12:07 +02:00
92fdbe5e03 #2244 User variables collation conflict is not detected 2003-12-31 19:01:03 +04:00
824111e6c4 Fix for the bug #2231: string column, INDEX+LIKE, don't take the ESCAPE character.
(acctually i don't like the fix, any suggestions?)
2003-12-30 19:23:38 +04:00
b703338d76 Merge
sql/set_var.cc:
  Auto merged
sql/mysqld.cc:
  SCCS merged
2003-12-30 13:16:49 +02:00
376fb08072 Some small portability fixes.
Added support for lower_case_table_names=2, which is to be used on case insensitive file systems.
This tells MySQL to preserve the used case of filenames and database names to make it esier to move files between cases sensitive can case insensitive file systems (like Windows and Linux)


client/mysqltest.c:
  Indentation cleanup
include/myisam.h:
  Made some pointers 'const'
mysql-test/mysql-test-run.sh:
  Portability fix for OSX
sql/filesort.cc:
  Safety fix (not needed for current code but needed for 5.0)
sql/ha_berkeley.cc:
  More debugging
  Changed 'create' to return error number
sql/ha_berkeley.h:
  Added HA_FILE_BASED
sql/ha_innodb.cc:
  Added missing DBUG_RETURN
sql/ha_isam.cc:
  Changed create to return error number
sql/ha_isam.h:
  Added HA_FILE_BASED
sql/ha_isammrg.h:
  Added HA_FILE_BASED
sql/ha_myisam.cc:
  Changed create to return error number
sql/ha_myisam.h:
  Added HA_FILE_BASED
sql/ha_myisammrg.cc:
  Changed create to return error number
sql/ha_myisammrg.h:
  Added HA_FILE_BASED
sql/handler.cc:
  Ensure that table engines gets table names in lower case even if we are using lower_case_table_names
  Removed test for DB_TYPE_INNODB by ensuring that create method returns error number.
sql/handler.h:
  Added HA_FILE_BASED
  Made some struct entries 'const'
  Added 'alias' for create to be able to create tables in mixed case on case insensitive file systems
sql/mysql_priv.h:
  Support for lower_case_table_names=2
sql/mysqld.cc:
  Support for lower_case_table_names=2
  Moved test of case insenstive file system after all mutex are created
sql/set_var.cc:
  Support for lower_case_table_names=2
sql/sql_class.h:
  Indentation change
sql/sql_db.cc:
  Support for lower_case_table_names=2
sql/sql_insert.cc:
  Indentation change
sql/sql_parse.cc:
  Support for lower_case_table_names=2
sql/sql_rename.cc:
  Support for lower_case_table_names=2
  Added missing 'unpack_filename' to RENAME which may fix a bug in RENAME TABLE on windows
sql/sql_show.cc:
  If lower_case_table_name=2 is given, show original case in SHOW CREATE TABLE
sql/sql_table.cc:
  Support for lower_case_table_names=2 for DROP TABLE, RENAME TABLE, ALTER TABLE and CREATE TABLE
2003-12-30 13:14:21 +02:00
35fd38150a Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/my/mysql-4.1


sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
2003-12-26 12:32:24 +02:00