1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-20 10:24:14 +03:00
Commit Graph

5151 Commits

Author SHA1 Message Date
de8a4f8052 Merge 2005-02-15 12:19:01 -08:00
dc162f61bb Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-02-15 16:13:03 +01:00
9b544cc0e8 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-02-15 14:12:26 +01:00
358cfd6c42 Better bug fix for #5569: "Incorrect "Access Denied" error with SAME login DIFFERENT host"
This fixes also the reverse lookup bug introduced by the previous patch



mysql-test/t/group_by.test:
  Remove empty line
vio/viosocket.c:
  Added function comment
2005-02-15 14:42:13 +02:00
ddcb947ff7 Allow hostnames that are IP addresses with a netmask even when
running with --skip-name-resolve. (Bug #8471)


sql/sql_acl.cc:
  Add '/' to list of characters that doesn't trigger a need for resolving the
  hostname, so that the IP mask syntax works with skip-name-resolve.
2005-02-14 20:33:14 -08:00
28b0b4513f Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-02-15 00:19:04 +01:00
4cead8c8a5 1) undoing my fix for BUG#8055 "Trouble with replication from temporary tables and ignores"
and fixing it another way (per Monty; a simpler solution which does not increase the number
of binlog events is to always execute DROP TEMPORARY TABLE IF EXISTS on slave). A new test rpl_drop_temp.
2) fixing BUG#8436 "Multiple "stacked" SQL statements cause replication to stop" by setting
thd->query_length to the length of the query being executed, not counting the next queries
if this is a multi-query. Should also improve display of SHOW PROCESSLIST. A new test rpl_multi_query.



mysql-test/r/drop_temp_table.result:
  back to one single DROP
sql/sql_base.cc:
  undoing the fix I had made some days ago: we are back to one single DROP TEMPORARY TABLE for all temp tables.
sql/sql_parse.cc:
  1) set thd->query_length to the length of the query being executed, excluding the other next queries
  if this is a multi-query. The setting happens ASAP, ie. just after we know it's a multi-query, ie. just after yyparse().
  Don't include the ';' in thd->query_length, because this is not good for storage in binlog.
  2) always execute a DROP TEMPORARY TABLE IF EXISTS on slave, don't skip it even if --replicate-ignore-table
2005-02-14 23:47:17 +01:00
92f55e98dd Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-bug8218


mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-02-14 23:49:01 +03:00
4173610bd2 Remove redundant DROP TABLE from test case 2005-02-14 23:45:48 +03:00
8a8d476453 Bug#8412: For replication to work correctly, the prologue and
epilogue to an SQL statement should not have an error code even
when the SQL statement itself has an error code.


mysql-test/r/rpl_insert_id.result:
  Adding test to ensure that slave handles error statement gracefully.
mysql-test/t/rpl_insert_id.test:
  Adding test to ensure that slave handles error statement gracefully.
sql/log.cc:
  Setting error code to 0 for SQL statement prologue and epilogue.
2005-02-14 18:39:33 +01:00
de3f93c6ff Bug#8351
Fix for crash when using a double quote in boolean fulltext query.


mysql-test/r/fulltext.result:
  Added a test case for bug #8351.
mysql-test/t/fulltext.test:
  Added a test case for bug #8351.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-02-14 18:54:12 +04:00
f048032c68 removed wrong distinct UNION detection (BUG#6565)
mysql-test/r/derived.result:
  test of union subquery in the FROM clause with complex distinct/all
mysql-test/t/derived.test:
  test of union subquery in the FROM clause with complex distinct/all
sql/sql_derived.cc:
  removed wrong distinct UNION detection
2005-02-14 02:06:21 +02:00
a8d2152f97 Bug#2435
Alter handling for UNION syntax
  Tests for UNION and parentheses


mysql-test/r/union.result:
  Bug#2435
    Tests for UNION and parentheses
mysql-test/t/union.test:
  Bug#2435
    Tests for UNION and parentheses
sql/sql_yacc.yy:
  Bug#2435
    Amend handling of UNION with parentheses.
2005-02-13 22:35:52 +00:00
276c90cd8a Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-02-13 19:52:41 +01:00
84d1199692 Fix for BUG#8218:
Remove TMP_TABLE_PARAM::copy_funcs_it. TMP_TABLE_PARAM is a member of JOIN which is 
copied via memcpy, and List_iterator_fast TMP_TABLE_PARAM::copy_funcs_it ends up 
pointing to the wrong List.


mysql-test/r/subselect.result:
  Testcase for BUG#8218
mysql-test/t/subselect.test:
  Testcase for BUG#8218
sql/sql_select.cc:
  Fix for BUG#8218: Create/use own iterator since TMP_TABLE_PARAM::copy_funcs_it is removed.
2005-02-12 22:58:54 +03:00
2d619d7cad Bug#8235 Connection collation change & table create with default result in crash
mysql-test/r/ctype_ucs.result:
  Test case
mysql-test/t/ctype_ucs.test:
  Test case
sql/field.cc:
  Fixed minus check to be UCS2-compatible
strings/ctype-ucs2.c:
  Missing my_scan_ucs2() was added.
2005-02-12 16:27:22 +04:00
a505845044 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-02-12 09:38:15 +01:00
01e96c5bcd Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-02-12 00:10:07 +01:00
bae820dc66 make LOAD INDEX to work 2005-02-12 00:05:13 +01:00
6cb5736b9b Manual merge 2005-02-11 15:00:29 -08:00
cf78ff6947 distinct.result:
Adjustment of the result file after the revision of the fix for bug #7520.


mysql-test/r/distinct.result:
  Adjustment of the result file after the revision of the fix for bug #7520.
2005-02-11 13:44:54 -08:00
aa3727d7dc select.result:
After revision of the fix for bug #7520.
table.cc:
  Revised the fix for bug #7520.
  Made it compliant with 5.0 code where the bug does not exist.


sql/table.cc:
  Revised the fix for bug #7520.
  Made it compliant with 5.0 code where the bug does not exist.
mysql-test/r/select.result:
  After revision of the fix for bug #7520.
2005-02-11 10:39:26 -08:00
4b7e8a8e37 Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0


BitKeeper/etc/logging_ok:
  auto-union
extra/replace.c:
  Auto merged
2005-02-10 23:48:35 -08:00
d78bd41f55 select.result:
Adjusted results of the test case for bug #7520 for 4.1.


mysql-test/r/select.result:
  Adjusted results of the test case for bug #7520 for 4.1.
2005-02-10 23:47:57 -08:00
dca07cf034 Merge rurik.mysql.com:/home/igor/dev/mysql-4.0-0
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0


BitKeeper/etc/logging_ok:
  auto-union
extra/replace.c:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
sql/table.cc:
  Auto merged
2005-02-10 22:17:18 -08:00
9540945624 select.result, select.test:
Added a test case for bug #7520.
table.cc:
  Fixed bug #7520.
  The bug was caused by a wrong calculation of the field max_key_length for
  a TABLE structure when there was an index on a blob field.


sql/table.cc:
  Fixed bug #7520.
  The bug was caused by a wrong calculation of the field max_key_length for
  a TABLE structure when there was an index on a blob field.
mysql-test/t/select.test:
  Added a test case for bug #7520.
mysql-test/r/select.result:
  Added a test case for bug #7520.
2005-02-10 22:15:38 -08:00
2a9b8f589e Fix all of the enum and set columns in privilege tables to be
case-insensitive. (Bug #7989)


mysql-test/r/system_mysql_db.result:
  Update results
scripts/mysql_create_system_tables.sh:
  Need to create enum and set columns with case-insensitive collation
scripts/mysql_fix_privilege_tables.sql:
  Modify all enum and set columns to be case-insensitive (and re-order some of
  the fix-ups to make it all happen smoothly).
2005-02-10 20:25:14 -08:00
2058659628 Re-enable ctype_latin1_de test for embedded server (already passes, so it
appears to have been accidently disabled) and enable ctype_ucs after moving
a subtest that requires binlog to its own test file.


mysql-test/mysql-test-run.sh:
  Remove hardcoded skip of ctype_latin1_de and ctype_ucs for embedded server
mysql-test/t/ctype_ucs.test:
  Move binlog test to a new test file
mysql-test/r/ctype_ucs.result:
  Update result after test moved
2005-02-10 18:08:30 -08:00
4f7a0857f1 Re-enable alter_table test for embedded server by moving grant-related test
to grant.test and using replace_column to neuter the Privileges column in
SHOW FULL COLUMNS.


BitKeeper/deleted/.del-alter_table.result.es~a1077916d429e443:
  Delete: mysql-test/r/alter_table.result.es
mysql-test/t/alter_table.test:
  Add replace_column for grant-related column
  Move grant-related test to grant.test
mysql-test/r/alter_table.result:
  Update results
mysql-test/t/grant.test:
  Move grant-related test from alter_table.test
mysql-test/r/grant.result:
  Add test results
mysql-test/mysql-test-run.sh:
  Don't skip alter_table test for embedded server
2005-02-09 18:17:40 -08:00
425f2f9111 Merge mysql.com:/home/jimw/my/mysql-4.1-zlib
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-09 16:36:24 -08:00
0fe1b28b75 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1


sql/item_cmpfunc.cc:
  Auto merged
2005-02-09 21:14:06 +02:00
86d5bfc42b reverted patch for BUG#7351 (because of performance ussie) 2005-02-09 21:08:08 +02:00
4360e74cd9 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1


sql/sql_select.cc:
  Auto merged
2005-02-09 19:22:35 +02:00
fa657a0642 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1-merge
2005-02-09 17:58:29 +01:00
e9da057b08 - make sure to include the embedded test results in the source distribution 2005-02-09 17:49:43 +01:00
1de817e9c4 Fix removal of tables from cache when the database they are contained
within is dropped and lower_case_table_names is set. (Bug #8355)


mysql-test/t/lowercase_table2.test:
  Add new regression test
mysql-test/r/lowercase_table2.result:
  Add results for regression test
sql/mysql_priv.h:
  Change remove_db_from_cache() to use char* instead of my_string
sql/sql_base.cc:
  Lowercase database name in remove_db_from_cache so
  that all of the correct entries are removed.
2005-02-08 15:14:14 -08:00
37e2873fe3 Fix for BUG#8371: wrong rec_per_key value for hash index on temporary table
mysql-test/r/heap_hash.result:
  Testcase for BUG#8371: wrong rec_per_key value for hash index on temporary table
mysql-test/t/heap_hash.test:
  Testcase for BUG#8371: wrong rec_per_key value for hash index on temporary table
sql/ha_heap.cc:
  Fix for BUG#8371: wrong rec_per_key value for hash index on temporary table:
  Don't assume that table->rec_per_key==NULL if table->tmp_table != NO_TMP_TABLE, 
  this is not true for tables created with "CREATE TEMPORARY TABLE" (while it holds
  for temporary tables created during query execution)
sql/sql_select.cc:
  Initialize rec_per_key for all keys in temporary table.
2005-02-08 23:44:51 +03:00
a50ef33d09 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-02-08 18:14:26 +01:00
30e89d0a48 Merge mysql.com:/home/wax/mysql/mysql-4.1
into mysql.com:/home/wax/mysql/mysql-4.1test2
2005-02-08 18:51:42 +05:00
f9e8bfbfb3 Merge
mysql-test/mysql-test-run.pl:
  SCCS merged
2005-02-08 13:59:29 +01:00
63982db93c Better bugfix for "HAVING when refering to RAND()" (Bug #8216)
Ensure that references in HAVING, ORDER BY or GROUP BY are calculated after fields in SELECT.
This will ensure that any reference to these has a valid value.
Generalized the code for split_sum_func()


BitKeeper/etc/ignore:
  added support-files/ndb-config-2-node.ini
mysql-test/r/group_by.result:
  More complicated test to assure that rand() is only calulated once
mysql-test/r/user_var.result:
  Back to old results :(  (ok but not perfect)
mysql-test/t/group_by.test:
  More complicated test to assure that rand() is only calulated once
sql/item.cc:
  Better bugfix for "HAVING when refering to RAND()"
  This will ensure that when refering to things like RAND() in HAVING through an alias we will not recalculate that rand() value in the HAVING part but use the value in the row
  Generalize split_sum_func()
sql/item.h:
  Better bugfix for "HAVING when refering to RAND()"
  T
sql/item_cmpfunc.cc:
  Better bugfix for "HAVING when refering to RAND()"
  Use generalized split_sum_func2() function
sql/item_func.cc:
  Better bugfix for "HAVING when refering to RAND()"
  Use generalized split_sum_func2() function
sql/item_row.cc:
  Better bugfix for "HAVING when refering to RAND()"
  Use generalized split_sum_func2() function
sql/item_strfunc.cc:
  Better bugfix for "HAVING when refering to RAND()"
  Use generalized split_sum_func2() function
sql/sql_list.h:
  Add functions to concatenate lists
sql/sql_select.cc:
  Better bugfix for "HAVING when refering to RAND()"
  Ensure that references in HAVING, ORDER BY or GROUP BY are calculated after fields in SELECT.
  This will ensure that any reference to these has a valid value.
2005-02-08 14:41:09 +02:00
6a1e756211 ndbcluster now runs clean in 4.1, 5.0 may still need some work 2005-02-08 06:11:05 +01:00
eb75a7a5e2 Add the zlib .libs directory to LD_LIBRARY_PATH in mysql-test-run.sh,
which fixes running the tests when using the bundled zlib.


mysql-test/mysql-test-run.sh:
  Add zlib .libs dir to LD_LIBRARY_PATH
2005-02-07 15:17:30 -08:00
4ddeaf265f mysql-test-run.pl:
Corrected user name passing
  Honor the --master-binary and --slave-binary options
  Insert the host name into 'user' table
  Added --udiff option, to get unified diff output
  Call special mtr_run_test() for running "mysqltest"
mtr_report.pl:
  Added --udiff option, to get unified diff output
init_db.sql:
  Insert the host name into 'user' table


mysql-test/lib/init_db.sql:
  Insert the host name into 'user' table
mysql-test/lib/mtr_report.pl:
  Added --udiff option, to get unified diff output
mysql-test/mysql-test-run.pl:
  Corrected user name passing
  Honor the --master-binary and --slave-binary options
  Insert the host name into 'user' table
  Added --udiff option, to get unified diff output
  Call special mtr_run_test() for running "mysqltest"
2005-02-07 20:32:56 +01:00
5be12eba73 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-02-07 19:31:02 +01:00
41dffbb150 mysql-test-run.sh:
fixed start-and-exit flag


mysql-test/mysql-test-run.sh:
  fixed start-and-exit flag
2005-02-07 17:59:46 +01:00
ac630383f4 have test suite continue even if ndbcluster fails to start if --force flag is set 2005-02-07 17:46:52 +01:00
edae64f4cb Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1


sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
2005-02-07 18:14:31 +02:00
d6ed8cd709 Fixed bug in HAVING when refering to RAND() through alias
(BUG 8216)


mysql-test/r/group_by.result:
  New test case
mysql-test/r/user_var.result:
  Test changed (to be more correct) with bug fix
mysql-test/t/group_by.test:
  Added test for HAVING bug
sql/item_cmpfunc.cc:
  Fixed bug in HAVING when refering to RAND()
sql/item_func.cc:
  Fixed bug in HAVING when refering to RAND()
sql/item_row.cc:
  Fixed bug in HAVING when refering to RAND()
sql/item_strfunc.cc:
  Fixed bug in HAVING when refering to RAND()
sql/unireg.h:
  Added PSEUDO_TABLES_BITS for easy testing of real table reference
2005-02-07 18:13:57 +02:00
7eedc24466 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-02-07 10:26:09 +01:00