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

6466 Commits

Author SHA1 Message Date
6c546f765c Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-leak-4.1


mysql-test/r/subselect.result:
  Auto merged
sql/item_subselect.cc:
  Auto merged
2003-03-15 11:24:44 +02:00
11117565a3 merge with 3.23 to get:
- Fix for empty table/column names


mysql-test/t/create.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/table.cc:
  Auto merged
tests/grant.pl:
  Auto merged
sql/filesort.cc:
  merge with 3.23
sql/sql_table.cc:
  merge with 3.23
tests/grant.res:
  merge with 3.23
2003-03-15 04:41:57 +02:00
f42419e4b3 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1


sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
strings/ctype-bin.c:
  Auto merged
2003-03-14 20:25:50 +01:00
03b0df9481 Check for empty table/column names
mysql-test/t/create.test:
  Test for empty table/column name
tests/grant.pl:
  More tests
tests/grant.res:
  More tests
2003-03-14 17:08:42 +02:00
6da897e04b fixed uncachable union (bug #150)
mysql-test/r/union.result:
  sect of uncachable union
mysql-test/t/union.test:
  sect of uncachable union
sql/sql_lex.h:
  fixed uncachable union
2003-03-14 14:16:09 +02:00
e97a000a65 make test result more obvious 2003-03-13 14:40:13 +01:00
012c8f9175 test result updated after merge 2003-03-13 14:34:07 +01:00
50da5c1858 merged
man/perror.1:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/gen_lex_hash.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
strings/ctype-tis620.c:
  Auto merged
mysql-test/r/analyse.result:
  ul
mysql-test/r/group_by.result:
  ul
mysql-test/r/select.result:
  ul
2003-03-13 13:44:03 +01:00
dd93a7994a Case insensitivrly has been added in charset and collation names. 2003-03-13 12:54:34 +04:00
da9d94997c making sure that test works. 2003-03-12 20:33:41 +02:00
f16873ec9a Merge bk-internal.mysql.com:/home/bk/mysql-3.23
into mashka.mysql.fi:/home/my/mysql-3.23
2003-03-12 16:43:37 +02:00
72f44dafe6 NEWDATE -> DATE in anylyse() output
Changed that analyse(#) also affects strings


mysql-test/r/analyse.result:
  Better analyse test
mysql-test/t/analyse.test:
  Better analyse test
sql/sql_analyse.cc:
  NEWDATE -> DATE in anylyse() output
  Changed that analyse(#) also affects strings
  Fixed that number of elements in ENUM is limited by # not by #+1
2003-03-12 16:43:01 +02:00
be079a5d78 Test case for rtree indexes. 2003-03-12 16:52:02 +04:00
40a781a6d6 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0


sql/sql_parse.cc:
  Auto merged
2003-03-12 14:48:00 +02:00
cbbe5e8e2b A little bit improved test case 2003-03-12 14:34:07 +02:00
5cd07da765 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0


mysql-test/mysql-test-run.sh:
  Auto merged
2003-03-12 05:21:31 +02:00
fa4f6e8998 Simple fixes (nothing notable)
dbug/dbug.c:
  Remove duplicate va_end() call
mysql-test/mysql-test-run.sh:
  Longer stack trace from valgrind
mysys/my_lib.c:
  Fixed wrong dbug printf
sql/slave.cc:
  Simple optimization
sql/sql_class.cc:
  Added DBUG info
2003-03-12 01:40:06 +02:00
b0a3c1c905 Merge sanja.is.com.ua:/home/bell/mysql/mysql-3.23
into sanja.is.com.ua:/home/bell/mysql/work-rand-3.23
2003-03-11 22:38:32 +02:00
dccac58396 fixed an obscure bug in group by + having + Item_ref::get_date 2003-03-11 21:20:53 +01:00
fd59fb1031 A bug fix for multi-table updates with InnoDB storage engine 2003-03-11 19:40:49 +02:00
8162aec6b9 fixed bug of unchecked random part of WHERE clause (bug #142)
mysql-test/r/select.result:
  test of random WHERE clause
mysql-test/t/select.test:
  test of random WHERE clause
sql/sql_select.cc:
  fixed bug of unchecked random part of WHERE clause
2003-03-11 18:34:00 +02:00
4901295af1 Conflicts relsolving
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_repl.h:
  Auto merged
2003-03-11 16:32:17 +04:00
83814ef429 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-in-4.1


sql/item_cmpfunc.cc:
  Auto merged
2003-03-11 13:26:26 +02:00
79a6e9dcda fixed cached constsnt determination (bug #142 related)
mysql-test/r/subselect.result:
  test of constant redecing
mysql-test/t/subselect.test:
  test of constant redecing
sql/item_cmpfunc.cc:
  fixed cached constsnt determination
2003-03-11 12:43:30 +02:00
f1662f3be9 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0
into gluh.mysql.r18.ru:/home/gluh/mysql-4.0.last


BitKeeper/etc/logging_ok:
  auto-union
client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
2003-03-11 13:52:19 +04:00
92457d6e45 Added 'PURGE LOGS BEFORE' command
Added expire-logs-days option 


mysql-test/r/rpl_rotate_logs.result:
  Added test for 'PURGE LOGS BEFORE'
mysql-test/t/rpl_rotate_logs.test:
  Added test for 'PURGE LOGS BEFORE'
sql/log.cc:
  For 'Purge logs before' command
sql/mysqld.cc:
  Added 'expire-logs-days' option
sql/set_var.cc:
  Added 'expire-logs-days' option
sql/sql_class.h:
  For 'Purge logs before' command
sql/sql_parse.cc:
  Added 'expire-logs-days' option
sql/sql_yacc.yy:
  For 'Purge logs before' command
2003-03-11 13:49:06 +04:00
3ab655681c Openssl test
client/mysqltest.c:
  For openssl test
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-03-11 13:41:53 +04:00
0c1af74d8a processing of subselect in global ORDER BY (fifed crash of server)
this implementation have limitation: prohibited subselect in ORDER BY dependence of most outer query (will be solved after removing passing first select_lex as fake select for global mysql_select())


mysql-test/r/subselect.result:
  test of subselect in global ORDER BY
mysql-test/t/subselect.test:
  test of subselect in global ORDER BY
sql/sql_lex.cc:
  fixed comments
  processing of subselect in global ORDER BY
sql/sql_lex.h:
  processing of subselect in global ORDER BY
sql/sql_parse.cc:
  processing of subselect in global ORDER BY
sql/sql_yacc.yy:
  processing of subselect in global ORDER BY
2003-03-11 01:06:28 +02:00
3f68b65e65 Merge bk-internal.mysql.com:/home/bk/mysql-3.23
into mashka.mysql.fi:/home/my/mysql-3.23


mysql-test/mysql-test-run.sh:
  Auto merged
2003-03-11 00:17:34 +02:00
fc5832de08 fixed cleanup bug
mysql-test/r/subselect.result:
  test of cleanup bug
mysql-test/t/subselect.test:
  test of cleanup bug
sql/sql_select.cc:
  fixed cleanup
2003-03-10 22:25:52 +02:00
bbc8f836c0 Fix for a bug with ROW(..) <=> ROW(...) 2003-03-10 20:54:18 +02:00
462a72b802 Adding tests for the fixed ORDER BY 0 bug 2003-03-10 17:07:39 +02:00
395714aa45 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-in-4.1


sql/item.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
2003-03-10 16:38:26 +02:00
c2ce5116f3 fixed crash on non-well-constructed reference
mysql-test/r/subselect.result:
  test of IN with error
mysql-test/t/subselect.test:
  test of IN with error
2003-03-10 16:38:06 +02:00
a6ea34ee5b merge
BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-delete.result:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/r/delete.result:
  Auto merged
mysql-test/r/type_datetime.result:
  Auto merged
mysql-test/t/delete.test:
  Auto merged
mysql-test/t/type_datetime.test:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_repl.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
2003-03-10 14:13:46 +02:00
5c100a6975 after merge fixes 2003-03-10 13:54:20 +02:00
012ffb5d50 Merge with 3.23 to get fixes for --user and BACKUP TABLE
BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-delete.result:
  Delete: mysql-test/r/delete.result
BitKeeper/deleted/.del-stamp-h.in~4a5d6676232516c5:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
include/my_sys.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/t/delete.test:
  Auto merged
mysql-test/t/join.test:
  Auto merged
mysql-test/t/type_datetime.test:
  Auto merged
mysys/my_copy.c:
  Auto merged
sql/field.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/sql_rename.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/mysql-test-run.sh:
  merge with 3.23.56
mysql-test/r/backup.result:
  merge (needs to be updated)
mysql-test/r/join.result:
  merge (needs to be updated)
mysql-test/r/type_datetime.result:
  merge (needs to be updated)
mysql-test/t/backup.test:
  merge with 3.23
scripts/mysqld_safe.sh:
  Only use first --user option
sql/ha_myisam.cc:
  Don't let BACKUP TABLE overwrite old files
sql/log_event.h:
  merge
sql/mysql_priv.h:
  merge
sql/mysqld.cc:
  Use first --user option
sql/slave.cc:
  use local version
sql/sql_repl.h:
  use local version
2003-03-10 12:48:43 +02:00
ea826f215f Merge bk-internal.mysql.com:/home/bk/mysql-3.23
into narttu.mysql.fi:/my/mysql-3.23
2003-03-10 11:23:11 +02:00
68ae365395 Don't allow BACKUP TABLE to overwrite files
Fixed memory leak when replication restarts in debug mode


include/my_sys.h:
  Added option to not overwrite files to my_copy()
mysql-test/mysql-test-run.sh:
  Fixed --ddd option
  Fixed that mysqld is restarted if there is a testname-master.sh file
mysql-test/r/backup.result:
  Update for security fix in BACKUP TABLE
mysql-test/t/backup.test:
  Update for security fix in BACKUP TABLE
mysys/my_copy.c:
  Added option to not overwrite files to my_copy()
sql/ha_myisam.cc:
  Don't allow BACKUP TABLE to overwrite files
sql/slave.cc:
  Fixed problem with --debug output from 'handle_slave'
  Fixed memory leak when replication restarts in debug mode
2003-03-10 11:22:37 +02:00
fd5182cb74 Changed --debug to append to test instead of creating new trace files.
(This patch is already in 4.0)


mysql-test/mysql-test-run.sh:
  Changed --debug to append to test instead of creating new trace files
2003-03-09 17:13:37 +02:00
0c911187d4 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/mysql_priv.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-03-07 21:48:22 +02:00
c3122e9a6c An interim code cleanup.
Major re-write of code yet has to be done, to circumvent
assigning of UNIT to current select and to deal better with 
offset, limit.


mysql-test/r/union.result:
  A fix of merge fix
2003-03-07 21:47:04 +02:00
157b36675e Fixed an unlikely optimizer bug that casued a core dump in pt_range.cc::sel_cmp()
mysql-test/r/join.result:
  Test of range optimizer bug
mysql-test/t/join.test:
  Test of range optimizer bug
sql/sql_rename.cc:
  Added missing DEBUG_PRINT()
2003-03-07 14:40:37 +02:00
6b941726f9 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0


sql/mysqld.cc:
  Auto merged
2003-03-07 11:58:07 +01:00
19a5b45477 Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0
BitKeeper/etc/ignore:
  auto-union
configure.in:
  Auto merged
2003-03-07 12:37:18 +02:00
efadca6441 Fixed AUTO_INCREMENT handling in MyISAM (last auto_increment patch broke things)
Some after merge fixes


mysql-test/r/ctype_latin1_de.result:
  Changed test to have more relevant results
mysql-test/r/delete.result:
  Updated results after merge
mysql-test/r/select.result:
  Remove explicit database usage
mysql-test/r/type_datetime.result:
  Updated results after merge
mysql-test/t/ctype_latin1_de.test:
  Changed test to have more relevant results
mysql-test/t/select.test:
  Remove explicit database usage
sql/ha_myisam.cc:
  Fixed AUTO_INCREMENT handling in MyISAM (last auto_increment patch broke things)
2003-03-07 12:36:52 +02:00
8d9d12d182 New syntax to change client collation:
SET COLLATION latin1
SET COLLATION 'latin1'
SET COLLATION DEFAULT
2003-03-07 11:54:26 +04:00
81f368cc54 Merge to get fix for LOCK TABLES + DROP TABLE in another thread
BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-delete.result:
  Delete: mysql-test/r/delete.result
client/mysqlbinlog.cc:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/t/delete.test:
  Auto merged
mysql-test/t/type_datetime.test:
  Auto merged
sql/field.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/r/type_datetime.result:
  Update results after merge
sql/log_event.h:
  Use local version
sql/mysql_priv.h:
  Use local version
sql/mysqld.cc:
  Use local version
sql/sql_repl.h:
  Use local version
2003-03-07 01:20:56 +02:00
6b3c898655 Fixed reentrantness bugs in select (lex->result) and select_dumpvar, and added cool
prime number test example.


mysql-test/r/sp.result:
  New prime number example. (Good for future benchmarkings too.)
mysql-test/t/sp.test:
  New prime number example. (Good for future benchmarkings too.)
sql/sql_class.cc:
  Reset row_count in select_dumpvar when preparing, to make it reentrant as a lex member.
sql/sql_select.cc:
  Don't delete result if it's a lex member (since lex needs to be reentrant).
2003-03-06 19:16:46 +01:00
c4f89626ee do not allow to cache queries with INTO clause
mysql-test/r/query_cache.result:
  INTO OUTFILE/DUMPFILE test
mysql-test/t/query_cache.test:
  INTO OUTFILE/DUMPFILE test
2003-03-06 17:37:12 +02:00