1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-24 19:42:23 +03:00
Commit Graph

2335 Commits

Author SHA1 Message Date
e03265d4d5 Removed random chars after filename for LOAD DATA INFILE (in mysqlbinlog)
Add quoting for use `database` for mysqlbinlog
Removed test ins0000001
Add support for --replace for exec in mysqltest
Don't refer to install dir in mysqlbinlog.result


BitKeeper/deleted/.del-ins000001.result~f45c599efdf8352b:
  Delete: mysql-test/r/ins000001.result
BitKeeper/deleted/.del-ins000001.test~2428ee5c9b1bc483:
  Delete: mysql-test/t/ins000001.test
client/mysqlbinlog.cc:
  Removed random chars after filename for LOAD DATA INFILE
client/mysqltest.c:
  Add support for --replace for 'exec'
mysql-test/r/drop_temp_table.result:
  Updated results after quoting change
mysql-test/r/fulltext_multi.result:
  Updated results after quoting change
mysql-test/r/fulltext_order_by.result:
  Updated results after quoting change
mysql-test/r/insert.result:
  New tests
mysql-test/r/insert_select.result:
  Updated results after quoting change
mysql-test/r/mix_innodb_myisam_binlog.result:
  Updated results after quoting change
mysql-test/r/mysqlbinlog.result:
  Updated results after quoting change
mysql-test/r/rpl_log.result:
  Updated results after quoting change
mysql-test/t/fulltext_multi.test:
  Remove 'use'
mysql-test/t/fulltext_order_by.test:
  Remove 'use'
mysql-test/t/insert.test:
  Merge test with ins0000001.test
mysql-test/t/mysqlbinlog.test:
  Don't refer to install dir in result
sql/log_event.cc:
  Add quoting for use `database` for mysqlbinlog
support-files/mysql.server.sh:
  Move pid_file test after arguments have been parsed
2003-09-29 12:31:35 +03:00
3106e3119a Fix for BUG#1345 "SQL Syntax Error in binarylog with DROP TABLES":
it's just backquoting the db's and table's names
when writing DROP TEMPORARY TABLE to the binlog when a connection ends.
A testcase for this.


sql/sql_base.cc:
  backquote db and table name when writing DROP TEMPORARY TABLE to the binlog
  when a connection ends.
2003-09-28 18:31:49 +02:00
f755cb36d0 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-rplunt
2003-09-26 17:55:10 +04:00
4a3bb67886 Fixed spurios failures of rpl_until test.
mysql-test/r/rpl_until.result:
  Fixed race then sometimes io slave thread stopped without managing to get any data from master and sometimes not.
mysql-test/t/rpl_until.test:
  Fixed race then sometimes io slave thread stopped without managing to get any data from master and sometimes not.
2003-09-26 17:42:05 +04:00
ba9e2efc17 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/dlenev/src/mysql-4.0-binlog
2003-09-25 20:05:39 +04:00
23dfae40f6 LPAD and RPAD test with UCS2 was added. 2003-09-25 18:06:39 +05:00
658a2d2f17 LPAD() and RPAD() are now multibyte-compatible 2003-09-25 17:31:20 +05:00
2d9e4e6698 fixed bug #1194
(changes in Item_func_set_user_var::update, ::val, ::val_str, ::val_int)


mysql-test/r/user_var.result:
  added tests for bug #1194
mysql-test/t/user_var.test:
  added tests for bug #1194
2003-09-24 19:30:20 -04:00
dae13b5415 Fix for BUG#1391:
"If LOAD DATA INFILE 'small_file' fails on master, slave leaves temp files"
(the bug is in the master)


mysql-test/r/rpl_loaddata.result:
  result update
mysql-test/std_data/rpl_loaddata2.dat:
  change to introduce a unique key violation
mysql-test/t/rpl_loaddata.test:
  testcase for bug#1391.
sql/sql_load.cc:
  fix for bug#1391:
  for a small file, we had in the binlog only the Create_file, not the Delete_file
  (the Create_file was written when the READ_INFO was destroyed).
2003-09-25 00:14:46 +02:00
87bc22a509 Test for mysqlbinlog
Particularly for BUG#1340 mysqlbinlog coredumps when reading Exec
event without seeing Create_file event before


mysql-test/mysql-test-run.sh:
  Now mysqlbinlog will use proper temporary directory
2003-09-24 23:25:58 +04:00
97933001fd Added MYSQL_BINLOG variable. 2003-09-24 16:46:19 +05:00
9e2b97fb25 #1169: Add --exec command to mysqltest 2003-09-24 16:13:47 +05:00
e9299e6da9 regexp worked only with the default character set.
Now it can work with any character set.
2003-09-24 13:57:26 +05:00
c3a58133b2 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-868
2003-09-23 13:28:48 +04:00
c4d9dc7dcf Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-09-22 17:28:19 +05:00
de826fdbfb Bug 1181 fix. LIKE didn't work with UCS2 character set. 2003-09-22 17:18:47 +05:00
bc26c1ff86 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-868
2003-09-22 11:00:51 +04:00
dc11b113b2 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1


sql/item_strfunc.cc:
  Auto merged
2003-09-22 11:39:29 +05:00
aa4b5cda52 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-868
2003-09-20 23:57:11 +04:00
e603c1efde fixed processing aggregate functions with static tables (BUG#1318)
mysql-test/r/func_group.result:
  test of BUG#1318
mysql-test/r/subselect.result:
  correct results
mysql-test/t/func_group.test:
  test of BUG#1318
sql/sql_select.cc:
  hixed processing of static tables
2003-09-20 18:30:36 +03:00
0a58c2ae87 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2003-09-19 19:08:43 +02:00
11c19587e1 removing my chmods so that the test can be run on non-Unix platforms
(kind request from the Novell team).
Note that old chmods in rpl_rotate_logs remain.


mysql-test/r/rpl000009.result:
  result update
mysql-test/t/rpl000009.test:
  removing my chmods so that the test can be run on non-Unix platforms.
2003-09-19 19:07:41 +02:00
4935e67c4f New test for UTF8 functionality 2003-09-19 16:59:14 +05:00
44bffa0b05 Fixed that multibyte charsets didn't honor multibyte
sequence boundaries in functions LIKE and LOCATE in
the case of "binary" collation. Comparison was done
like if the strings were just a binary strings without
character set assumption.
2003-09-19 15:18:19 +05:00
748a351376 Test for mysqldump 2003-09-19 14:02:49 +05:00
334b634c9f Fix for the bug #1333: COMPRESS(NULL) segfaults.
mysql-test/r/func_compress.result:
  Test for the bug #1333: COMPRESS(NULL) segfaults.
mysql-test/t/func_compress.test:
  Test for the bug #1333: COMPRESS(NULL) segfaults.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-09-19 12:25:03 +05:00
c5e6bcea69 Applied Monty corrections to the FULL SCAN
optimiser bug patch.


mysql-test/r/distinct.result:
  test results reverted
mysql-test/r/order_by.result:
  test results reverted
sql/sql_select.cc:
  found_constrain renamed to found_constraint
  We don't perform full cartesian product in 
  case when JOIN BUFFER is used: it was taken
  into account.
  s->read_time may contain range index read time,
  so to get full table scan time is necessary to
  call s->table->file->scan_time().
2003-09-17 21:52:05 +04:00
cf24f5acd7 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-union-4.1


sql/sql_parse.cc:
  Auto merged
2003-09-17 14:55:27 +03:00
524fe47d0e fixed test result to be in sync with the optimiser 2003-09-17 14:00:43 +04:00
a3056adeb6 Merge oak.local:/home/kostja/mysql/mysql-4.0-root
into oak.local:/home/kostja/mysql/mysql-4.0-rightnow
2003-09-16 21:26:26 +04:00
cac860c793 select.test cleanup
mysql-test/r/select.result:
  unnecessary info removed from result
mysql-test/t/select.test:
  unnecessary info don't get into result any more
2003-09-16 20:28:29 +04:00
2e95bcc477 Bug fix:
SET character_set_connection=newcharset;
  SELECT hex('text');

The above sequence failed in some cases.
2003-09-16 17:14:23 +05:00
414bd57b33 UCS tests 2003-09-16 16:26:33 +05:00
62f2cb14ee Bug fix:
http://bugs.mysql.com/bug.php?id=1264
2003-09-16 15:43:17 +05:00
a0c238f641 Bug fix:
http://bugs.mysql.com/bug.php?id=1264
2003-09-16 12:36:36 +05:00
0ebd55fc24 Bug fix:
http://bugs.mysql.com/bug.php?id=1129
From:	Georg Richter
Description: there is a problem with special chars like umlauts in comments
2003-09-16 12:14:40 +05:00
bf9c210fce Made rpl_until test independent from mysqld version
mysql-test/r/rpl_until.result:
  Made test indepdendent from mysqld version
mysql-test/t/rpl_until.test:
  Made test indepdendent from mysqld version
2003-09-16 02:58:46 +04:00
db03c7e89f Fixed bug in the optimiser for FULL TABLE SCAN case:
to estimate correctly cost of full table scan we should take into
account rows read and skipped on each iteration.


mysql-test/r/distinct.result:
  Fixed test suite: now full scan is used
  less often
mysql-test/r/join_outer.result:
  Fixed test suite: now full scan is used
  less often
mysql-test/r/select_safe.result:
  Fixed test suite: now full scan is used
  less often
2003-09-15 22:21:39 +04:00
34da7161b1 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1
2003-09-15 12:45:48 +02:00
0ea88acaa3 Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-09-15 14:48:23 +05:00
faf5df672d In CREATE syntax: KEY a (field_name(10))
10 now means "number of characters", not number of bytes.
2003-09-15 14:45:42 +05:00
49baac8d4f Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.1
2003-09-15 11:43:11 +03:00
7385c4984e Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1
2003-09-15 10:31:31 +02:00
e0c70de4c8 type_nchar.result:
I forgot to push it in the previous changeset.


mysql-test/r/type_nchar.result:
  I forgot to push it in the previous changeset.
2003-09-15 12:48:34 +05:00
15bde938b1 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.1
2003-09-15 10:35:52 +03:00
bf6480ba7c New syntax:
CREATE TABLE t1(a NVARCHAR(10))
This is for compatibility with MSSQL, DB2, Informix and some other DBMSs.

Note, standard SQL doesn't have "NVARCHAR" syntax.
There are only these syntaxes in SQL2003:
 NATIONAL VARCHAR
 NCHAR VARCHAR
 NATIONAL CHARACTER VARYING 
 NCHAR VARYING

- Tests were added for all the above syntaxes.


sql/lex.h:
  New syntax:
  
  CREATE TABLE t1(a NVARCHAR(10))
  This is for compatibility with MSSQL, DB2, Informix and some other DBMSs.
  
  Note, standard SQL doesn't have "NVARCHAR" syntax.
  There are only these syntaxes in SQL2003:
   NATIONAL VARCHAR
   NCHAR VARCHAR
   NATIONAL CHARACTER VARYING 
   NCHAR VARYING
sql/sql_yacc.yy:
  New syntax:
  
  CREATE TABLE t1(a NVARCHAR(10))
  This is for compatibility with MSSQL, DB2, Informix and some other DBMSs.
  
  Note, standard SQL doesn't have "NVARCHAR" syntax.
  There are only these syntaxes in SQL2003:
   NATIONAL VARCHAR
   NCHAR VARCHAR
   NATIONAL CHARACTER VARYING 
   NCHAR VARYING
2003-09-15 10:26:48 +05:00
04d1b04edd fixed proccesing global LIMIT in last SELECT of UNION
mysql-test/r/subselect.result:
  correct results
mysql-test/r/union.result:
  correct results
mysql-test/t/subselect.test:
  to be sure that results are correct
sql/sql_parse.cc:
  comment + TODO
2003-09-14 22:12:55 +03:00
982f13302b Fixed openssl_1 test after error message was updated
mysql-test/r/openssl_1.result:
  Fixed test after error message was updated
2003-09-14 18:07:14 +04:00
5d1b299f74 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-868
2003-09-14 17:19:53 +04:00
b15eba8820 Post merge fixes. Fixed tests after adding UNTIL conditions
to SHOW SLAVE STATUS.


mysql-test/r/rpl000015.result:
  Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
mysql-test/r/rpl_empty_master_crash.result:
  Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
mysql-test/r/rpl_error_ignored_table.result:
  Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
mysql-test/r/rpl_flush_log_loop.result:
  Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
mysql-test/r/rpl_loaddata.result:
  Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
mysql-test/r/rpl_log.result:
  Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
mysql-test/r/rpl_log_pos.result:
  Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
mysql-test/r/rpl_max_relay_size.result:
  Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
mysql-test/r/rpl_openssl.result:
  Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
mysql-test/r/rpl_redirect.result:
  Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
mysql-test/r/rpl_replicate_do.result:
  Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
mysql-test/r/rpl_reset_slave.result:
  Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
mysql-test/r/rpl_rotate_logs.result:
  Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
mysql-test/r/rpl_until.result:
  Post merge fix
mysql-test/t/rpl_until.test:
  Post merge fix
2003-09-14 17:18:38 +04:00